From c54a1c62efc51b5af5e7b642d2809e89289e9909 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Mon, 22 Jan 2024 21:53:45 -0600 Subject: [PATCH] fix(ci): move to ubuntu --- .github/workflows/cache.yml | 49 +++++++++++++++++++++---------------- .github/workflows/lint.yml | 4 +-- .github/workflows/test.yml | 34 ++++++++++++++----------- 3 files changed, 50 insertions(+), 37 deletions(-) diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml index 8b9431e..064a9a2 100644 --- a/.github/workflows/cache.yml +++ b/.github/workflows/cache.yml @@ -5,7 +5,7 @@ on: jobs: molecule: name: cache - runs-on: macos-12 + runs-on: ubuntu-large-runner env: PYTHON_VERSION: "3.11" @@ -58,28 +58,35 @@ jobs: restore-keys: | vagrant-boxes - - name: Configure Homebrew cache - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0 - id: cache-homebrew - with: - path: | - ~/Library/Caches/Homebrew - key: brew-${{ hashFiles('./Brewfile') }} - restore-keys: brew- - - - name: Update Homebrew - if: | # only run if false since this is just a cache step - steps.cache-homebrew.outputs.cache-hit != 'true' || steps.cache-vagrant.outputs.cache-hit != 'true' + - name: install apt packages run: | - brew update --preinstall + wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg + echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list + sudo apt update && sudo apt -y install vagrant virtualbox - - name: Install Homebrew dependencies - if: | # only run if false since this is just a cache step - steps.cache-homebrew.outputs.cache-hit != 'true' || steps.cache-cache-vagrant.outputs.cache-hit != 'true' - run: | - env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade --file ./Brewfile - vagrant --version - vboxmanage --version + + # - name: Configure Homebrew cache + # uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0 + # id: cache-homebrew + # with: + # path: | + # ~/Library/Caches/Homebrew + # key: brew-${{ hashFiles('./Brewfile') }} + # restore-keys: brew- + + # - name: Update Homebrew + # if: | # only run if false since this is just a cache step + # steps.cache-homebrew.outputs.cache-hit != 'true' || steps.cache-vagrant.outputs.cache-hit != 'true' + # run: | + # brew update --preinstall + + # - name: Install Homebrew dependencies + # if: | # only run if false since this is just a cache step + # steps.cache-homebrew.outputs.cache-hit != 'true' || steps.cache-cache-vagrant.outputs.cache-hit != 'true' + # run: | + # env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade --file ./Brewfile + # vagrant --version + # vboxmanage --version - name: Download Vagrant boxes for all scenarios # To save some cache space, all scenarios share the same cache key. diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 264f0d9..a4e95b3 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -5,7 +5,7 @@ on: jobs: pre-commit-ci: name: Pre-Commit - runs-on: macos-12 + runs-on: ubuntu-large-runner env: PYTHON_VERSION: "3.11" @@ -42,7 +42,7 @@ jobs: ensure-pinned-actions: name: Ensure SHA Pinned Actions - runs-on: macos-12 + runs-on: ubuntu-large-runner steps: - name: Checkout code uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5428384..2f822ba 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,7 +5,7 @@ on: jobs: molecule: name: Molecule - runs-on: macos-12 + runs-on: ubuntu-large-runner strategy: matrix: scenario: @@ -41,22 +41,28 @@ jobs: python-version: ${{ env.PYTHON_VERSION }} cache: 'pip' # caching pip dependencies - - name: Restore Homebrew cache - uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0 - with: - path: | - ~/Library/Caches/Homebrew - key: brew-${{ hashFiles('./Brewfile') }} + # - name: Restore Homebrew cache + # uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0 + # with: + # path: | + # ~/Library/Caches/Homebrew + # key: brew-${{ hashFiles('./Brewfile') }} - - name: Update Homebrew - run: | - brew update --preinstall + # - name: Update Homebrew + # run: | + # brew update --preinstall - - name: Install Homebrew dependencies + # - name: Install Homebrew dependencies + # run: | + # env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade --file ./Brewfile + # vagrant --version + # vboxmanage --version + + - name: install apt packages run: | - env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade --file ./Brewfile - vagrant --version - vboxmanage --version + wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg + echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list + sudo apt update && sudo apt -y install vagrant virtualbox - name: Restore vagrant Boxes cache uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0