Upload symbols in push-dynamic job

OpenMW · Aug 23, 2024 · 2f6ac6c · 2f6ac6c
1 parent 0a35ebe
commit 2f6ac6c
Showing 1 changed file with 21 additions and 18 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -186,28 +186,11 @@ jobs:
         name: vcpkg-x64-${{ matrix.image }}-${{ github.sha }}
         path: ${{ github.workspace }}/vcpkg-x64-${{ matrix.image }}-${{ github.sha }}.7z
 
-    - name: Repackage binaries for symbol server
-      env:
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      if: ${{ env.AWS_ACCESS_KEY_ID != '' && env.AWS_SECRET_ACCESS_KEY != '' }}
-      working-directory: ${{ github.workspace }}/openmw-deps/windows
-      run: .\Store-Symbols.ps1 ${{ github.workspace }}\intermediate
-
-    - name: Upload symbols to symbol server
-      env:
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        AWS_DEFAULT_REGION: eu-west-3
-      if: ${{ env.AWS_ACCESS_KEY_ID != '' && env.AWS_SECRET_ACCESS_KEY != '' }}
-      working-directory: ${{ github.workspace }}/openmw-deps/windows/SymStore
-      run: aws --endpoint-url https://rgw.ctrl-c.liu.se s3 sync --size-only --exclude * --include *.dl_ --include *.pd_ . s3://openmw-sym
-
   push-dynamic:
     needs:
     - dynamic
 
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
 
     steps:
     - uses: actions/checkout@v4
@@ -270,9 +253,11 @@ jobs:
       run: git clone https://gitlab.com/OpenMW/openmw-deps.git
 
     - name: Move exported vcpkg packages and pdb files archive to openmw-deps repository
+      shell: bash
       run: mv vcpkg-x64-*-${{ github.sha }}/vcpkg-x64-*-${{ github.sha }}.7z openmw-deps/windows/
 
     - name: Generate commit message
+      shell: bash
       env:
         GH_TOKEN: ${{ github.token }}
       working-directory: ${{ github.workspace }}/openmw-deps
@@ -286,6 +271,7 @@ jobs:
 
     - name: Commit exported vcpkg packages
       working-directory: ${{ github.workspace }}/openmw-deps
+      shell: bash
       run: |
         git checkout -b vcpkg-x64-${{ github.sha }}
         git add windows/vcpkg-x64-*-${{ github.sha }}.7z
@@ -305,3 +291,20 @@ jobs:
       run: |
         git remote set-url --push origin "${{ vars.PUSH_URL }}"
         git push origin vcpkg-x64-${{ github.sha }}
+
+    - name: Repackage binaries for symbol server
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      if: ${{ env.AWS_ACCESS_KEY_ID != '' && env.AWS_SECRET_ACCESS_KEY != '' }}
+      working-directory: ${{ github.workspace }}/openmw-deps/windows
+      run: .\Store-Symbols.ps1 ${{ github.workspace }}\intermediate
+
+    - name: Upload symbols to symbol server
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        AWS_DEFAULT_REGION: eu-west-3
+      if: ${{ env.AWS_ACCESS_KEY_ID != '' && env.AWS_SECRET_ACCESS_KEY != '' }}
+      working-directory: ${{ github.workspace }}/openmw-deps/windows/SymStore
+      run: aws --endpoint-url https://rgw.ctrl-c.liu.se s3 sync --size-only --exclude * --include *.dl_ --include *.pd_ . s3://openmw-sym