Skip to content

Commit 469730f

Browse files
authored
Separate Build ID step for each OS
1 parent 2c176c7 commit 469730f

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

.github/workflows/qatest.yaml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,10 @@ jobs:
6262
github.event_name == 'workflow_dispatch'
6363
6464
steps:
65-
# Common steps for both OSes
65+
# Windows-specific steps
6666
- name: Set Build ID
67-
shell: bash
67+
if: matrix.os == 'windows'
68+
shell: pwsh
6869
run: |
6970
if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
7071
echo "BUILD_ID=${{ github.event.inputs.build_id }}" >> $GITHUB_ENV
@@ -74,7 +75,6 @@ jobs:
7475
echo "ARTIFACTS_URL=https://api.github.com/repos/secondlife/viewer/actions/runs/${{ github.event.workflow_run.id }}/artifacts" >> $GITHUB_ENV
7576
fi
7677
77-
# Windows-specific steps
7878
- name: Temporarily Allow PowerShell Scripts (Windows)
7979
if: matrix.os == 'windows'
8080
shell: pwsh
@@ -213,6 +213,18 @@ jobs:
213213
python "${{ matrix.install-path }}\runTests.py"
214214
215215
# Mac-specific steps
216+
- name: Set Build ID (Mac)
217+
if: matrix.os == 'mac'
218+
shell: bash
219+
run: |
220+
if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
221+
echo "BUILD_ID=${{ github.event.inputs.build_id }}" >> $GITHUB_ENV
222+
echo "ARTIFACTS_URL=https://api.github.com/repos/secondlife/viewer/actions/runs/${{ github.event.inputs.build_id }}/artifacts" >> $GITHUB_ENV
223+
else
224+
echo "BUILD_ID=${{ github.event.workflow_run.id }}" >> $GITHUB_ENV
225+
echo "ARTIFACTS_URL=https://api.github.com/repos/secondlife/viewer/actions/runs/${{ github.event.workflow_run.id }}/artifacts" >> $GITHUB_ENV
226+
fi
227+
216228
- name: Verify viewer-sikulix-main Exists (Mac)
217229
if: matrix.os == 'mac'
218230
shell: bash

0 commit comments

Comments
 (0)