diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2021-02-19 22:18:50 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2021-02-19 22:20:00 +1100 |
| commit | ebb3b75e974cb241c6b9b9f5881b09c7bd32b651 (patch) | |
| tree | 96296b72bf2ea365b62b4de512fe5562a3adc6fb | |
| parent | 76c0be0fe0465cb2b975dbd409f8d38b55e55bcb (diff) | |
Rename "vm" to "os" in selfhosted to match c-cpp.
Should make it easier to share code or maybe merge at some point.
| -rw-r--r-- | .github/workflows/selfhosted.yml | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/.github/workflows/selfhosted.yml b/.github/workflows/selfhosted.yml index 6b150661..980ca11a 100644 --- a/.github/workflows/selfhosted.yml +++ b/.github/workflows/selfhosted.yml @@ -7,28 +7,28 @@ on: jobs: selfhosted: if: github.repository == 'openssh/openssh-portable-selfhosted' - runs-on: ${{ matrix.vm }} + runs-on: ${{ matrix.os }} env: - TARGET_HOST: ${{ matrix.vm }} + TARGET_HOST: ${{ matrix.os }} SUDO: sudo strategy: fail-fast: false # We use a matrix in two parts: firstly all of the VMs are tested with the # default config. "vm" corresponds to a label associated with the worker. matrix: - vm: [dfly30, dfly48, dfly58, sol10, sol11, bbone, fbsd12] + os: [dfly30, dfly48, dfly58, sol10, sol11, bbone, fbsd12] configs: - default # Then we include any extra configs we want to test for specific VMs. include: - - { vm: dfly30, configs: without-openssl} - - { vm: dfly48, configs: pam } - - { vm: dfly58, configs: pam } - - { vm: fbsd12, configs: pam } - - { vm: sol10, configs: pam } - - { vm: sol11, configs: pam } - - { vm: sol11, configs: sol64 } - # - { vm: sol11, configs: sol64-pam } + - { os: dfly30, configs: without-openssl} + - { os: dfly48, configs: pam } + - { os: dfly58, configs: pam } + - { os: fbsd12, configs: pam } + - { os: sol10, configs: pam } + - { os: sol11, configs: pam } + - { os: sol11, configs: sol64 } + # - { os: sol11, configs: sol64-pam } steps: - uses: actions/checkout@v2 - name: autoreconf @@ -43,7 +43,7 @@ jobs: if: always() uses: actions/upload-artifact@v2 with: - name: ${{ matrix.vm }}-${{ matrix.configs }}-config-files + name: ${{ matrix.os }}-${{ matrix.configs }}-config-files path: | config.h config.log @@ -57,7 +57,7 @@ jobs: if: failure() uses: actions/upload-artifact@v2 with: - name: ${{ matrix.vm }}-${{ matrix.configs }}-regress-logs + name: ${{ matrix.os }}-${{ matrix.configs }}-regress-logs path: regress/*.log - name: shutdown VM if: always() |