Skip to content

Commit 73d849e

Browse files
WIP Re-use test-manager binary for Windows tests
1 parent 321ac00 commit 73d849e

File tree

1 file changed

+21
-2
lines changed

1 file changed

+21
-2
lines changed

.github/workflows/desktop-e2e.yml

+21-2
Original file line numberDiff line numberDiff line change
@@ -374,20 +374,39 @@ jobs:
374374
matrix:
375375
os: ${{ fromJSON(needs.prepare-matrices.outputs.windows_matrix) }}
376376
steps:
377+
- name: Checkout repository
378+
uses: actions/checkout@v4
379+
- name: Create binaries directory & add to PATH
380+
shell: bash -ieo pipefail {0}
381+
run: |
382+
# Put all binaries in a known folder: test-runner, connection-checker, mullvad-version
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+
chmod +x ${{ github.workspace }}/bin/*
377394
- name: Download App
378395
uses: actions/download-artifact@v4
379396
if: ${{ needs.build-windows.result == 'success' }}
380397
with:
381398
name: windows-build
382399
path: ~/.cache/mullvad-test/packages
383-
- name: Checkout repository
384-
uses: actions/checkout@v4
385400
- name: Run end-to-end tests
386401
shell: bash -ieo pipefail {0}
387402
env:
388403
CURRENT_VERSION: ${{needs.get-app-version.outputs.mullvad-version}}
389404
run: |
405+
# A directory with all the binaries is required to run test-manager.
406+
# The test scripts which runs in CI expects this folder to be available as the `TEST_DIST_DIR` variable.
407+
export TEST_DIST_DIR="${{ github.workspace }}/bin/"
390408
export TEST_FILTERS="${{ github.event.inputs.tests }}"
409+
ls -la "$TEST_DIST_DIR"
391410
./test/scripts/run/ci.sh ${{ matrix.os }}
392411
- name: Upload test report
393412
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)