Skip to content

Commit cb5a7c0

Browse files
WIP Re-use test-manager binary for Windows tests
1 parent 6f115d4 commit cb5a7c0

File tree

1 file changed

+23
-3
lines changed

1 file changed

+23
-3
lines changed

.github/workflows/desktop-e2e.yml

+23-3
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,8 @@ jobs:
360360
path: .\dist\*.exe
361361

362362
e2e-test-windows:
363-
needs: [prepare-matrices, build-windows, get-app-version]
363+
#needs: [prepare-matrices, build-windows, get-app-version]
364+
needs: [prepare-matrices, get-app-version, build-test-manager-linux]
364365
if: |
365366
!cancelled() &&
366367
needs.get-app-version.result == 'success' &&
@@ -374,20 +375,39 @@ jobs:
374375
matrix:
375376
os: ${{ fromJSON(needs.prepare-matrices.outputs.windows_matrix) }}
376377
steps:
378+
- name: Checkout repository
379+
uses: actions/checkout@v4
380+
- name: Create binaries directory & add to PATH
381+
shell: bash -ieo pipefail {0}
382+
run: |
383+
mkdir "${{ github.workspace }}/bin"
384+
echo "${{ github.workspace }}/bin/" >> "$GITHUB_PATH"
385+
- name: Download Test Manager
386+
uses: actions/download-artifact@v4
387+
if: ${{ needs.build-test-manager-linux.result == 'success' }}
388+
with:
389+
name: linux-test-manager-build
390+
path: ${{ github.workspace }}/bin
391+
- name: chmod binaries
392+
run: |
393+
ls -la ${{ github.workspace }}/bin/*
394+
chmod +x ${{ github.workspace }}/bin/*
377395
- name: Download App
378396
uses: actions/download-artifact@v4
379397
if: ${{ needs.build-windows.result == 'success' }}
380398
with:
381399
name: windows-build
382400
path: ~/.cache/mullvad-test/packages
383-
- name: Checkout repository
384-
uses: actions/checkout@v4
385401
- name: Run end-to-end tests
386402
shell: bash -ieo pipefail {0}
387403
env:
388404
CURRENT_VERSION: ${{needs.get-app-version.outputs.mullvad-version}}
389405
run: |
406+
# A directory with all the binaries is required to run test-manager.
407+
# The test scripts which runs in CI expects this folder to be available as the `TEST_DIST_DIR` variable.
408+
export TEST_DIST_DIR="${{ github.workspace }}/bin/"
390409
export TEST_FILTERS="${{ github.event.inputs.tests }}"
410+
ls -la "$TEST_DIST_DIR"
391411
./test/scripts/run/ci.sh ${{ matrix.os }}
392412
- name: Upload test report
393413
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)