From 274b01f7f683140dd00778e9a7d5c8d537d7fa8c Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Thu, 2 Jun 2022 15:32:20 -0500 Subject: [PATCH] Move tests to run in MacOS 12 (#2) --- .github/actions/install_packer/action.yml | 3 ++- .github/actions/install_virtualbox/action.yml | 9 +++++++++ .github/workflows/test.yml | 4 +++- 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 .github/actions/install_virtualbox/action.yml diff --git a/.github/actions/install_packer/action.yml b/.github/actions/install_packer/action.yml index 412f14e..2e8d682 100644 --- a/.github/actions/install_packer/action.yml +++ b/.github/actions/install_packer/action.yml @@ -1,5 +1,6 @@ name: Install Packer -description: Installs the packerio executable and its attendant tools to ~/bin +description: Installs the packerio executable and its attendant tools to /usr/local/bin + for Ubuntu hosts inputs: version: description: Version of Packer to install diff --git a/.github/actions/install_virtualbox/action.yml b/.github/actions/install_virtualbox/action.yml new file mode 100644 index 0000000..3d8b754 --- /dev/null +++ b/.github/actions/install_virtualbox/action.yml @@ -0,0 +1,9 @@ +name: Install virtualbox on Mac +description: Installs virtualbox on Mac runners +runs: + using: composite + steps: + - shell: bash + run: | + set -exo pipefail + brew install virtualbox vagrant diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 958ee31..a452d8e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -57,7 +57,7 @@ jobs: ubuntu = json.loads('${{ steps.collection.outputs.tox-envs }}') macos = json.loads('${{ steps.vagrant.outputs.tox-envs }}') ub_zip = [{'os': 'ubuntu-latest', 'scenario': u} for u in ubuntu] - mac_zip = [{'os': 'macos-10.15', 'scenario': m} for m in macos] + mac_zip = [{'os': 'macos-12', 'scenario': m} for m in macos] print("::set-output name=scenarios::" + json.dumps(ub_zip + mac_zip)) lint: @@ -83,5 +83,7 @@ jobs: steps: - uses: actions/checkout@v3 - uses: ./.github/actions/setup + - uses: ./.github/actions/install_virtualbox + if: startsWith(matrix.scenarios.os, 'macos') - name: Run scenario run: tox -e "${{ matrix.scenarios.scenario }}"