Rename "vm" to "os" in selfhosted to match c-cpp.

Should make it easier to share code or maybe merge at some point.
This commit is contained in:
Darren Tucker 2021-02-19 22:18:50 +11:00
parent 76c0be0fe0
commit ebb3b75e97

View File

@ -7,28 +7,28 @@ on:
jobs: jobs:
selfhosted: selfhosted:
if: github.repository == 'openssh/openssh-portable-selfhosted' if: github.repository == 'openssh/openssh-portable-selfhosted'
runs-on: ${{ matrix.vm }} runs-on: ${{ matrix.os }}
env: env:
TARGET_HOST: ${{ matrix.vm }} TARGET_HOST: ${{ matrix.os }}
SUDO: sudo SUDO: sudo
strategy: strategy:
fail-fast: false fail-fast: false
# We use a matrix in two parts: firstly all of the VMs are tested with the # 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. # default config. "vm" corresponds to a label associated with the worker.
matrix: matrix:
vm: [dfly30, dfly48, dfly58, sol10, sol11, bbone, fbsd12] os: [dfly30, dfly48, dfly58, sol10, sol11, bbone, fbsd12]
configs: configs:
- default - default
# Then we include any extra configs we want to test for specific VMs. # Then we include any extra configs we want to test for specific VMs.
include: include:
- { vm: dfly30, configs: without-openssl} - { os: dfly30, configs: without-openssl}
- { vm: dfly48, configs: pam } - { os: dfly48, configs: pam }
- { vm: dfly58, configs: pam } - { os: dfly58, configs: pam }
- { vm: fbsd12, configs: pam } - { os: fbsd12, configs: pam }
- { vm: sol10, configs: pam } - { os: sol10, configs: pam }
- { vm: sol11, configs: pam } - { os: sol11, configs: pam }
- { vm: sol11, configs: sol64 } - { os: sol11, configs: sol64 }
# - { vm: sol11, configs: sol64-pam } # - { os: sol11, configs: sol64-pam }
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: autoreconf - name: autoreconf
@ -43,7 +43,7 @@ jobs:
if: always() if: always()
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: ${{ matrix.vm }}-${{ matrix.configs }}-config-files name: ${{ matrix.os }}-${{ matrix.configs }}-config-files
path: | path: |
config.h config.h
config.log config.log
@ -57,7 +57,7 @@ jobs:
if: failure() if: failure()
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: ${{ matrix.vm }}-${{ matrix.configs }}-regress-logs name: ${{ matrix.os }}-${{ matrix.configs }}-regress-logs
path: regress/*.log path: regress/*.log
- name: shutdown VM - name: shutdown VM
if: always() if: always()