diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2024-03-31 21:51:57 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2024-03-31 22:26:45 +1100 |
| commit | 43e7c1c07cf6aae7f4394ca8ae91a3efc46514e2 (patch) | |
| tree | e5199af0a6f77ca96c837e3f8859768eb9d3d5c4 | |
| parent | 281ea25a44bff53eefb4af7bab7aa670b1f8b6b2 (diff) | |
Port changes from selfhosted to upstream tests.
Should get them working again.
| -rw-r--r-- | .github/workflows/upstream.yml | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/.github/workflows/upstream.yml b/.github/workflows/upstream.yml index 14e6d9f4..f0de34d6 100644 --- a/.github/workflows/upstream.yml +++ b/.github/workflows/upstream.yml @@ -11,17 +11,21 @@ jobs: if: github.repository == 'openssh/openssh-portable-selfhosted' runs-on: 'libvirt' env: - DEBUG_ACTIONS: false - HOST: 'libvirt' + DEBUG_ACTIONS: true EPHEMERAL: true + HOST: 'libvirt' TARGET_HOST: ${{ matrix.target }} TARGET_CONFIG: ${{ matrix.config }} + TARGET_DOMAIN: ${{ format('{0}-{1}-{2}', matrix.target, matrix.config, github.run_id) || matrix.target }} strategy: fail-fast: false matrix: target: [ obsdsnap, obsdsnap-i386 ] config: [ default, without-openssl, ubsan ] steps: + - name: unmount stale workspace + run: fusermount -u ${GITHUB_WORKSPACE} || true + working-directory: ${{ runner.temp }} - name: shutdown VM if running run: vmshutdown working-directory: ${{ runner.temp }} @@ -29,6 +33,9 @@ jobs: - name: startup VM run: vmstartup working-directory: ${{ runner.temp }} + - name: copy and mount workspace + run: sshfs_mount + working-directory: ${{ runner.temp }} - name: update source run: vmrun "cd /usr/src && cvs up -dPA usr.bin/ssh regress/usr.bin/ssh" - name: make clean @@ -50,6 +57,10 @@ jobs: path: | /usr/obj/regress/usr.bin/ssh/obj/*.log /usr/obj/regress/usr.bin/ssh/obj/log/* + - name: unmount workspace + if: always() + run: fusermount -u ${GITHUB_WORKSPACE} || true + working-directory: ${{ runner.temp }} - name: shutdown VM if: always() run: vmshutdown |