From fcc9755f7286a72ead742a5158a63592783a572e Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Tue, 17 Dec 2024 22:40:57 +0000 Subject: [PATCH 1/5] Create symbol server directory and make it an artifact --- .github/workflows/windows.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 5d3f030abc..f3ecf565a1 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -134,6 +134,10 @@ jobs: mkdir ${{ github.workspace }}/build/iconengines cp plugins/iconengines/qsvgicon.dll ${{ github.workspace }}/build/iconengines + - name: Create symbol server directory structure + run: | + .\CI\Store-Symbols.ps1 + - name: Move pdb files run: | robocopy build pdb *.pdb /MOVE @@ -179,6 +183,12 @@ jobs: name: openmw-windows-${{ inputs.image }}-${{ github.sha }} path: ${{ github.workspace }}/install/* + - name: Store symbol server artifacts + uses: actions/upload-artifact@v4 + with: + name: openmw-windows-${{ inputs.image }}-sym-store-${{ github.sha }} + path: ${{ github.workspace }}/SymStore/* + - name: Add install directory to PATH shell: bash run: echo '${{ github.workspace }}/install' >> ${GITHUB_PATH} From 470feecc30d4db84c15daae6f390bc242ef5856e Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Tue, 17 Dec 2024 23:15:33 +0000 Subject: [PATCH 2/5] Run Store-Symbols.ps1 from build directory --- .github/workflows/windows.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index f3ecf565a1..cfe8c69161 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -135,8 +135,10 @@ jobs: cp plugins/iconengines/qsvgicon.dll ${{ github.workspace }}/build/iconengines - name: Create symbol server directory structure + working-directory: ${{ github.workspace }}/build run: | - .\CI\Store-Symbols.ps1 + ${{ github.workspace }}\CI\Store-Symbols.ps1 + Move-Item ${{ github.workspace }}\build\SymStore ${{ github.workspace }} - name: Move pdb files run: | From 79564860d51506e9a0fcd5cacf9a60b244da3763 Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Wed, 18 Dec 2024 00:00:49 +0000 Subject: [PATCH 3/5] Add CI-ID.txt to sym-store zip --- .github/workflows/windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index cfe8c69161..c82b5871dc 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -172,6 +172,7 @@ jobs: job_url=$(gh run --repo ${{ github.repository }} view ${{ github.run_id }} --json jobs --jq '.jobs[] | select(.name == "windows-${{ inputs.image }}") | .url') printf "Ref ${{ github.ref }}\nJob ${job_url}\nCommit ${{ github.sha }}\n" > install/CI-ID.txt cp install/CI-ID.txt pdb/CI-ID.txt + cp install/CI-ID.txt SymStore/CI-ID.txt - name: Store OpenMW archived pdb files uses: actions/upload-artifact@v4 From 5e81e51d6f42ebe545ef0d0dc21cef2e6c2ca061 Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Wed, 18 Dec 2024 00:20:59 +0000 Subject: [PATCH 4/5] Upload symbols to symbol server if inputs.package is enabled At the moment, we're not sending the regular artifacts to the artifacts bucket, but we might want to change that. We're also not putting the symbols on the symbol server for non-packaged builds, and might want to change that, too. The reason I didn't is that we don't have users running around using the GitHub Actions builds as dev builds. --- .github/workflows/windows.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index c82b5871dc..6f9baebdf6 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -192,6 +192,15 @@ jobs: name: openmw-windows-${{ inputs.image }}-sym-store-${{ github.sha }} path: ${{ github.workspace }}/SymStore/* + - name: Upload 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 != '' && inputs.package }} + working-directory: ${{ github.workspace }}/SymStore + run: aws --endpoint-url https://rgw.ctrl-c.liu.se s3 sync --size-only --exclude * --include *.ex_ --include *.dl_ --include *.pd_ . s3://openmw-sym + - name: Add install directory to PATH shell: bash run: echo '${{ github.workspace }}/install' >> ${GITHUB_PATH} From 96845081c03ed0bfd7effa86273ddb2ce74ece5b Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Wed, 18 Dec 2024 15:30:16 +0000 Subject: [PATCH 5/5] Attempt to inherit secrets --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d8d8d9ca6a..8541ede194 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,3 +24,4 @@ jobs: vcpkg-deps-tag: ${{ needs.Output-Envs.outputs.VCPKG_DEPS_TAG }} build-type: Release package: true + secrets: inherit