fix(ci): adjusting cache steps

This commit is contained in:
Timothy Stewart
2024-01-21 19:59:25 -06:00
parent fc8ab77be4
commit 8acec7055a
6 changed files with 43 additions and 43 deletions

View File

@@ -5,7 +5,7 @@ on:
jobs: jobs:
molecule: molecule:
name: cache name: cache
runs-on: macos-13 runs-on: macos-12
env: env:
PYTHON_VERSION: "3.11" PYTHON_VERSION: "3.11"
@@ -58,26 +58,26 @@ jobs:
restore-keys: | restore-keys: |
vagrant-boxes vagrant-boxes
- name: Configure Homebrew cache # - name: Configure Homebrew cache
uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0 # uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
id: cache-homebrew # id: cache-homebrew
with: # with:
path: | # path: |
~/Library/Caches/Homebrew # ~/Library/Caches/Homebrew
key: brew-${{ hashFiles('./Brewfile') }} # key: brew-${{ hashFiles('./Brewfile') }}
restore-keys: brew- # restore-keys: brew-
- name: Update Homebrew # - name: Update Homebrew
if: | # only run if false since this is just a cache step # 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' # steps.cache-homebrew.outputs.cache-hit != 'true' || steps.cache-homebrew.outputs.cache-hit != 'true'
run: | # run: |
brew update --preinstall # brew update --preinstall
- name: Install Homebrew dependencies # - name: Install Homebrew dependencies
if: | # only run if false since this is just a cache step # 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' # steps.cache-homebrew.outputs.cache-hit != 'true' || steps.cache-homebrew.outputs.cache-hit != 'true'
run: | # run: |
env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade --file ./Brewfile # env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade --file ./Brewfile
- name: Download Vagrant boxes for all scenarios - name: Download Vagrant boxes for all scenarios
# To save some cache space, all scenarios share the same cache key. # To save some cache space, all scenarios share the same cache key.

View File

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

View File

@@ -5,7 +5,7 @@ on:
jobs: jobs:
molecule: molecule:
name: Molecule name: Molecule
runs-on: macos-13 runs-on: macos-12
strategy: strategy:
matrix: matrix:
scenario: scenario:
@@ -28,19 +28,19 @@ jobs:
path: ~/.ansible/collections path: ~/.ansible/collections
key: ansible-${{ hashFiles('collections/requirements.yml') }} key: ansible-${{ hashFiles('collections/requirements.yml') }}
- name: Restore Homebrew cache # - name: Restore Homebrew cache
uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0 # uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0
with: # with:
path: ~/Library/Caches/Homebrew # path: ~/Library/Caches/Homebrew
key: brew-${{ hashFiles('./Brewfile') }} # key: brew-${{ hashFiles('./Brewfile') }}
- name: Update Homebrew # - name: Update Homebrew
run: | # run: |
brew update --preinstall # brew update --preinstall
- name: Install Homebrew dependencies # - name: Install Homebrew dependencies
run: | # run: |
env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade --file ./Brewfile # env HOMEBREW_NO_AUTO_UPDATE=1 brew bundle --no-upgrade --file ./Brewfile
- name: Restore vagrant Boxes cache - name: Restore vagrant Boxes cache
uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0 uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # 4.0

View File

@@ -8,7 +8,7 @@ platforms:
- name: control1 - name: control1
box: generic/ubuntu2204 box: generic/ubuntu2204
memory: 1024 memory: 1024
cpus: 2 cpus: 1
groups: groups:
- k3s_cluster - k3s_cluster
- master - master
@@ -24,7 +24,7 @@ platforms:
- name: control2 - name: control2
box: generic/debian11 box: generic/debian11
memory: 1024 memory: 1024
cpus: 2 cpus: 1
groups: groups:
- k3s_cluster - k3s_cluster
- master - master
@@ -35,7 +35,7 @@ platforms:
- name: control3 - name: control3
box: generic/rocky9 box: generic/rocky9
memory: 1024 memory: 1024
cpus: 2 cpus: 1
groups: groups:
- k3s_cluster - k3s_cluster
- master - master
@@ -46,7 +46,7 @@ platforms:
- name: node1 - name: node1
box: generic/ubuntu2204 box: generic/ubuntu2204
memory: 1024 memory: 1024
cpus: 2 cpus: 1
groups: groups:
- k3s_cluster - k3s_cluster
- node - node
@@ -62,7 +62,7 @@ platforms:
- name: node2 - name: node2
box: generic/rocky9 box: generic/rocky9
memory: 1024 memory: 1024
cpus: 2 cpus: 1
groups: groups:
- k3s_cluster - k3s_cluster
- node - node

View File

@@ -7,7 +7,7 @@ platforms:
- name: control1 - name: control1
box: generic/ubuntu2204 box: generic/ubuntu2204
memory: 1024 memory: 1024
cpus: 2 cpus: 1
groups: groups:
- k3s_cluster - k3s_cluster
- master - master
@@ -23,7 +23,7 @@ platforms:
- name: control2 - name: control2
box: generic/ubuntu2204 box: generic/ubuntu2204
memory: 1024 memory: 1024
cpus: 2 cpus: 1
groups: groups:
- k3s_cluster - k3s_cluster
- master - master
@@ -39,7 +39,7 @@ platforms:
- name: node1 - name: node1
box: generic/ubuntu2204 box: generic/ubuntu2204
memory: 1024 memory: 1024
cpus: 2 cpus: 1
groups: groups:
- k3s_cluster - k3s_cluster
- node - node

View File

@@ -6,8 +6,8 @@ driver:
platforms: platforms:
- name: control1 - name: control1
box: generic/ubuntu2204 box: generic/ubuntu2204
memory: 4096 memory: 1024
cpus: 4 cpus: 1
config_options: config_options:
# We currently can not use public-key based authentication on Ubuntu 22.04, # We currently can not use public-key based authentication on Ubuntu 22.04,
# see: https://github.com/chef/bento/issues/1405 # see: https://github.com/chef/bento/issues/1405