fix(ci): adjusting cache steps

This commit is contained in:
Timothy Stewart
2024-01-21 22:35:47 -06:00
parent ffcc79300a
commit 4707002267
4 changed files with 31 additions and 68 deletions

View File

@@ -5,7 +5,7 @@ on:
jobs:
molecule:
name: cache
runs-on: macos-12
runs-on: macos-13
env:
PYTHON_VERSION: "3.11"
@@ -58,26 +58,26 @@ 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: 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-homebrew.outputs.cache-hit != 'true'
# run: |
# brew update --preinstall
- name: Update Homebrew
if: | # only run if false since this is just a cache step
steps.cache-homebrew.outputs.cache-hit != 'true' || steps.cache-homebrew.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-homebrew.outputs.cache-hit != 'true'
# run: |
# env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade --file ./Brewfile
- 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-homebrew.outputs.cache-hit != 'true'
run: |
env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade --file ./Brewfile
- name: Download Vagrant boxes for all scenarios
# To save some cache space, all scenarios share the same cache key.

View File

@@ -5,7 +5,7 @@ on:
jobs:
pre-commit-ci:
name: Pre-Commit
runs-on: macos-12
runs-on: macos-13
env:
PYTHON_VERSION: "3.11"
@@ -46,7 +46,7 @@ jobs:
ensure-pinned-actions:
name: Ensure SHA Pinned Actions
runs-on: macos-12
runs-on: macos-13
steps:
- name: Checkout code
uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0

View File

@@ -5,7 +5,7 @@ on:
jobs:
molecule:
name: Molecule
runs-on: macos-12
runs-on: macos-13
strategy:
matrix:
scenario:
@@ -22,25 +22,19 @@ jobs:
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Restore Ansible cache
- name: Restore Homebrew cache
uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
with:
path: ~/.ansible/collections
key: ansible-${{ hashFiles('collections/requirements.yml') }}
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
# run: |
# env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade --file ./Brewfile
- name: Install Homebrew dependencies
run: |
env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade --file ./Brewfile
- name: Restore vagrant Boxes cache
uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
@@ -57,9 +51,6 @@ jobs:
* fdad:bad:ba55::/64
EOF
- name: Add Vagrant Boxes
run: ./.github/add-boxes.sh
- name: Install dependencies
run: |
echo "::group::Upgrade pip"
@@ -70,10 +61,6 @@ jobs:
python3 -m pip install -r requirements.txt
echo "::endgroup::"
echo "::group::Install Ansible role requirements from collections/requirements.yml"
ansible-galaxy install -r collections/requirements.yml
echo "::endgroup::"
- name: Test with molecule
run: molecule test --scenario-name ${{ matrix.scenario }}
timeout-minutes: 90