ci: adjust sequence of steps

ZL-Audio · Sep 16, 2023 · 5ede0fb · 5ede0fb
1 parent 767c3d1
commit 5ede0fb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 225 deletions.
diff --git a/.github/workflows/cmake_full_test.yml b/.github/workflows/cmake_full_test.yml
@@ -108,6 +108,10 @@ jobs:
       with:
         boost_version: 1.80.0
 
+    - name: Configure
+      shell: bash
+      run: cmake -B ${{ env.BUILD_DIR }} -G Ninja -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE}} -DCMAKE_C_COMPILER_LAUNCHER=${{ matrix.ccache }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ matrix.ccache }} -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" .
+
     - name: Setup Environment Variables
       shell: bash
       run: |

diff --git a/.github/workflows/cmake_quick.yml b/.github/workflows/cmake_quick.yml
diff --git a/.github/workflows/cmake_release.yml b/.github/workflows/cmake_release.yml
@@ -98,16 +98,13 @@ jobs:
       with:
         submodules: true # Get JUCE populated
 
-    - name: Get lastest tag
-      uses: "WyriHaximus/github-action-get-previous-tag@v1"
-      id: get-latest-tag
-      with:
-        fallback: 0.0.0
+    - name: Configure
+      shell: bash
+      run: cmake -B ${{ env.BUILD_DIR }} -G Ninja -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE}} -DCMAKE_C_COMPILER_LAUNCHER=${{ matrix.ccache }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ matrix.ccache }} -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" .
 
     - name: Setup Environment Variables
       shell: bash
       run: |
-        echo "${{steps.get-latest-tag.outputs.tag}}" > VERSION
         VERSION=$(cat VERSION)
         echo "ARTIFACTS_PATH=${{ env.BUILD_DIR }}/${{ env.PROJECT_NAME }}_artefacts/${{ env.BUILD_TYPE }}" >> $GITHUB_ENV
         echo "VST3_PATH=${{ env.PROJECT_NAME }}_artefacts/${{ env.BUILD_TYPE }}/VST3/${{ env.PRODUCT_NAME }}.vst3" >> $GITHUB_ENV
@@ -128,10 +125,6 @@ jobs:
         p12-file-base64: ${{ secrets.DEV_ID_APP_CERT }}
         p12-password: ${{ secrets.DEV_ID_APP_PASSWORD }}
 
-    - name: Configure
-      shell: bash
-      run: cmake -B ${{ env.BUILD_DIR }} -G Ninja -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE}} -DCMAKE_C_COMPILER_LAUNCHER=${{ matrix.ccache }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ matrix.ccache }} -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" .
-
     - name: Build
       shell: bash
       run: cmake --build ${{ env.BUILD_DIR }} --config ${{ env.BUILD_TYPE }} --parallel 4