Skip to content

Commit 84a122d

Browse files
authored
Merge pull request #4035 from secondlife/atlas-qaworkflow
Test and resolve qatest.yaml errors
2 parents c1255a1 + 147442c commit 84a122d

File tree

1 file changed

+33
-25
lines changed

1 file changed

+33
-25
lines changed

.github/workflows/qatest.yaml

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Run QA Test # Runs automated tests on a self-hosted QA machine
1+
name: Run QA Test # Runs automated tests on self-hosted QA machines
22

33
permissions:
44
contents: read
@@ -10,17 +10,13 @@ on:
1010
- completed
1111
workflow_dispatch:
1212
inputs:
13-
branch_name:
14-
description: 'Branch name to simulate workflow (e.g. develop)'
15-
required: true
16-
default: 'develop'
1713
build_id:
1814
description: 'Build workflow run ID (e.g. For github.com/secondlife/viewer/actions/runs/1234567890 the ID is 1234567890)'
1915
required: true
2016
default: '14806728332'
2117

2218
concurrency:
23-
group: qa-test-run-${{ matrix.runner }}
19+
group: ${{ github.workflow }}-${{ github.ref }}
2420
cancel-in-progress: false # Prevents cancellation of in-progress jobs
2521

2622
jobs:
@@ -45,16 +41,16 @@ jobs:
4541
- os: windows
4642
runner: qa-windows-atlas
4743
artifact: Windows-installer
48-
install-path: 'C:\viewer-sikulix-main'
44+
install-path: 'C:\viewer-automation-main'
4945
- os: windows
5046
runner: qa-dan-asus
5147
artifact: Windows-installer
52-
install-path: 'C:\viewer-sikulix-main'
48+
install-path: 'C:\viewer-automation-main'
5349
# Commented out until mac runner is available
5450
# - os: mac
5551
# runner: qa-mac
5652
# artifact: Mac-installer
57-
# install-path: 'HOME/Documents/viewer-sikulix-main'
53+
# install-path: 'HOME/Documents/viewer-automation-main'
5854
fail-fast: false
5955

6056
runs-on: [self-hosted, "${{ matrix.runner }}"]
@@ -66,34 +62,34 @@ jobs:
6662
github.event_name == 'workflow_dispatch'
6763
6864
steps:
69-
# Common steps for both OSes
65+
# Windows-specific steps
7066
- name: Set Build ID
71-
shell: bash
67+
if: matrix.os == 'windows'
68+
shell: pwsh
7269
run: |
73-
if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
74-
echo "BUILD_ID=${{ github.event.inputs.build_id }}" >> $GITHUB_ENV
75-
echo "ARTIFACTS_URL=https://api.github.com/repos/secondlife/viewer/actions/runs/${{ github.event.inputs.build_id }}/artifacts" >> $GITHUB_ENV
76-
else
77-
echo "BUILD_ID=${{ github.event.workflow_run.id }}" >> $GITHUB_ENV
78-
echo "ARTIFACTS_URL=https://api.github.com/repos/secondlife/viewer/actions/runs/${{ github.event.workflow_run.id }}/artifacts" >> $GITHUB_ENV
79-
fi
70+
if ("${{ github.event_name }}" -eq "workflow_dispatch") {
71+
echo "BUILD_ID=${{ github.event.inputs.build_id }}" | Out-File -FilePath $env:GITHUB_ENV -Append
72+
echo "ARTIFACTS_URL=https://api.github.com/repos/secondlife/viewer/actions/runs/${{ github.event.inputs.build_id }}/artifacts" | Out-File -FilePath $env:GITHUB_ENV -Append
73+
} else {
74+
echo "BUILD_ID=${{ github.event.workflow_run.id }}" | Out-File -FilePath $env:GITHUB_ENV -Append
75+
echo "ARTIFACTS_URL=https://api.github.com/repos/secondlife/viewer/actions/runs/${{ github.event.workflow_run.id }}/artifacts" | Out-File -FilePath $env:GITHUB_ENV -Append
76+
}
8077
81-
# Windows-specific steps
8278
- name: Temporarily Allow PowerShell Scripts (Windows)
8379
if: matrix.os == 'windows'
8480
shell: pwsh
8581
run: |
8682
Set-ExecutionPolicy RemoteSigned -Scope Process -Force
8783
88-
- name: Verify viewer-sikulix-main Exists (Windows)
84+
- name: Verify viewer-automation-main Exists (Windows)
8985
if: matrix.os == 'windows'
9086
shell: pwsh
9187
run: |
9288
if (-Not (Test-Path -Path '${{ matrix.install-path }}')) {
93-
Write-Host '❌ Error: viewer-sikulix not found on runner!'
89+
Write-Host '❌ Error: viewer-automation folder not found on runner!'
9490
exit 1
9591
}
96-
Write-Host '✅ viewer-sikulix is already available.'
92+
Write-Host '✅ viewer-automation folder is provided.'
9793
9894
- name: Fetch & Download Installer Artifact (Windows)
9995
if: matrix.os == 'windows'
@@ -217,15 +213,27 @@ jobs:
217213
python "${{ matrix.install-path }}\runTests.py"
218214
219215
# Mac-specific steps
220-
- name: Verify viewer-sikulix-main Exists (Mac)
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+
228+
- name: Verify viewer-automation-main Exists (Mac)
221229
if: matrix.os == 'mac'
222230
shell: bash
223231
run: |
224232
if [ ! -d "${{ matrix.install-path }}" ]; then
225-
echo "❌ Error: viewer-sikulix not found on runner!"
233+
echo "❌ Error: viewer-automation folder not found on runner!"
226234
exit 1
227235
fi
228-
echo "✅ viewer-sikulix is already available."
236+
echo "✅ viewer-automation is provided."
229237
230238
- name: Fetch & Download Installer Artifact (Mac)
231239
if: matrix.os == 'mac'

0 commit comments

Comments
 (0)