Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update base digest to 4d8ee66 #17

Merged
merged 6 commits into from
Nov 10, 2024
Merged

chore(deps): update base digest to 4d8ee66 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5897413
chore(deps): update base digest to 4d8ee66
renovate[bot] Nov 10, 2024
b9dd45a
fix(deps): update pre-commit hook pre-commit/pre-commit-hooks to v5
dafyddj Nov 10, 2024
10af2ae
fix(deps): update pre-commit hook python-jsonschema/check-jsonschema …
dafyddj Nov 10, 2024
25f623c
fix(deps): update actions/checkout action to v4.2.2
dafyddj Nov 10, 2024
b066fb7
fix(workflows): changes for working with newer macOS runners & Vagran…
dafyddj Nov 10, 2024
8f5ead2
test: approve new changes
dafyddj Nov 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion base
Open in desktop
Submodule base updated 6 files
+24 −0 .github/renovate.json5
+7 −3 .github/workflows/libbuild.yml
+8 −8 .github/workflows/main.yml
+2 −2 .pre-commit-config.yaml
+4 −2 qemu-x64/main.build
+2 −1 vbox-x64/main.build
10 changes: 7 additions & 3 deletions template/.github/workflows/libbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
MAKE_VARS: ""
steps:
- name: Checkout repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Debug on runner (When re-run with "Enable debug logging" checked)
if: runner.debug
uses: mxschmitt/action-tmate@a283f9441d2d96eb62436dc46d7014f5d357ac22 # v3
Expand All @@ -53,14 +53,18 @@ jobs:
sudo apt --yes install vagrant $TECHNEG_VAGRANT_PROVIDER
elif [ "$kernel_name" == "Darwin" ]; then
brew update
brew install make
brew install make qemu vagrant
fi
- name: Prepare environment
if: startsWith(inputs.build-type, 'qemu')
run: |
# Needed until a fix for Gem dependencies is released (Vagrant 2.4.3?)
echo VAGRANT_DISABLE_STRICT_DEPENDENCY_ENFORCEMENT=1 >> $GITHUB_ENV
kernel_name=$(uname -s)
if [ "$kernel_name" == "Linux" ]; then
echo PKR_VAR_accelerator=kvm >> $GITHUB_ENV
elif [ "$kernel_name" == "Darwin" ]; then
: # No action needed for Darwin
fi
- name: Run Packer
id: packer
Expand All @@ -75,7 +79,7 @@ jobs:
if: ${{ !startsWith(runner.name, 'self') }}
uses: actionshub/chef-install@d41f8dde8642d5cd05abefa333fbf2784cff830c # 3.0.0
env:
# renovate: datasource=github-tags depName=chef/chef-workstation
# renovate: datasource=custom.omnitruck depName=chef-workstation
CHEF_WS_VERSION: 24.8.1068
with:
project: chef-workstation
Expand Down
4 changes: 2 additions & 2 deletions template/.pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: check-added-large-files
- id: check-merge-conflict
args: [--assume-in-merge]
- id: check-yaml
exclude: ^kitchen.yml$
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.29.2
rev: 0.29.4
hooks:
- id: check-github-workflows
name: Check GitHub workflows with check-jsonschema
Expand Down
10 changes: 7 additions & 3 deletions test/SetBoxName/libbuild_yml.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
MAKE_VARS: ""
steps:
- name: Checkout repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Debug on runner (When re-run with "Enable debug logging" checked)
if: runner.debug
uses: mxschmitt/action-tmate@a283f9441d2d96eb62436dc46d7014f5d357ac22 # v3
Expand All @@ -53,14 +53,18 @@ jobs:
sudo apt --yes install vagrant $TECHNEG_VAGRANT_PROVIDER
elif [ "$kernel_name" == "Darwin" ]; then
brew update
brew install make
brew install make qemu vagrant
fi
- name: Prepare environment
if: startsWith(inputs.build-type, 'qemu')
run: |
# Needed until a fix for Gem dependencies is released (Vagrant 2.4.3?)
echo VAGRANT_DISABLE_STRICT_DEPENDENCY_ENFORCEMENT=1 >> $GITHUB_ENV
kernel_name=$(uname -s)
if [ "$kernel_name" == "Linux" ]; then
echo PKR_VAR_accelerator=kvm >> $GITHUB_ENV
elif [ "$kernel_name" == "Darwin" ]; then
: # No action needed for Darwin
fi
- name: Run Packer
id: packer
Expand All @@ -75,7 +79,7 @@ jobs:
if: ${{ !startsWith(runner.name, 'self') }}
uses: actionshub/chef-install@d41f8dde8642d5cd05abefa333fbf2784cff830c # 3.0.0
env:
# renovate: datasource=github-tags depName=chef/chef-workstation
# renovate: datasource=custom.omnitruck depName=chef-workstation
CHEF_WS_VERSION: 24.8.1068
with:
project: chef-workstation
Expand Down
4 changes: 2 additions & 2 deletions test/SetBoxName/pre-commit_yaml.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: check-added-large-files
- id: check-merge-conflict
args: [--assume-in-merge]
- id: check-yaml
exclude: ^kitchen.yml$
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.29.2
rev: 0.29.4
hooks:
- id: check-github-workflows
name: Check GitHub workflows with check-jsonschema
Expand Down