Clone c++-rewrite branch

kcat · Nov 16, 2023 · 8bda7c5 · 8bda7c5
1 parent 2516abd
commit 8bda7c5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/Tagged.yaml b/.github/workflows/Tagged.yaml
@@ -32,8 +32,8 @@ jobs:
           }
     steps:
 
-    - name: Checkout repository
-      uses: actions/[email protected]
+    - name: Clone DSOAL
+      run: git clone -b c++-rewrite https://github.com/kcat/dsoal.git .
 
     - name: Clone latest OpenAL Soft commit
       run: |
@@ -50,8 +50,9 @@ jobs:
 
     - name: ${{matrix.config.name}} - Build DSOAL
       run: |
-        cmake -B "${{github.workspace}}/build" -A ${{matrix.config.platform}}
-        cmake --build "${{github.workspace}}/build" --config ${{env.Configuration}}
+        cd build
+        cmake -A ${{matrix.config.platform}} ..
+        cmake --build . --config ${{env.Configuration}} --clean-first
 
     - name: ${{matrix.config.name}} - Build OpenAL Soft
       run: |

diff --git a/.github/workflows/Untagged.yaml b/.github/workflows/Untagged.yaml
@@ -3,7 +3,7 @@ name: Untagged build
 on:
   push:
     branches:
-      - 'master'
+      - 'rewrite'
     tags-ignore:
       - '*.*.*'
     paths-ignore:
@@ -38,7 +38,7 @@ jobs:
     steps:
 
     - name: Clone DSOAL
-      run: git clone https://github.com/kcat/dsoal.git .
+      run: git clone -b c++-rewrite https://github.com/kcat/dsoal.git .
 
     - name: Clone OpenAL Soft
       run: git clone https://github.com/kcat/openal-soft.git
@@ -57,8 +57,9 @@ jobs:
 
     - name: ${{matrix.config.name}} - Build DSOAL
       run: |
-        cmake -B "${{github.workspace}}/build" -A ${{matrix.config.platform}}
-        cmake --build "${{github.workspace}}/build" --config ${{env.Configuration}}
+        cd build
+        cmake -A ${{matrix.config.platform}} ..
+        cmake --build . --config ${{env.Configuration}} --clean-first
 
     - name: ${{matrix.config.name}} - Build OpenAL Soft
       run: |
@@ -135,7 +136,7 @@ jobs:
       uses: "marvinpinto/action-automatic-releases@latest"
       with:
         repo_token: "${{secrets.GITHUB_TOKEN}}"
-        automatic_release_tag: "latest"
+        automatic_release_tag: "rewrite"
         prerelease: true
         title: "[${{needs.Build.outputs.CurrentDate}}] DSOAL r${{needs.Build.outputs.DSOALCommitCount}}@${{needs.Build.outputs.DSOALCommitHashShort}} + OpenAL Soft r${{needs.Build.outputs.OpenALSoftCommitCount}}@${{needs.Build.outputs.OpenALSoftCommitHashShort}}"
         files: "Release/*"