From 58974135aca1b2b3b5df34cd5e8ac9e1d127ad96 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 10 Nov 2024 01:38:59 +0000 Subject: [PATCH 1/6] chore(deps): update base digest to 4d8ee66 --- base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base b/base index 5d772a0..4d8ee66 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit 5d772a02dab66f2617dca4d4551f961460d95bd6 +Subproject commit 4d8ee66e87e3bc55ab6fc6b7c191ea930f498ccd From b9dd45a9eb35dda457046a26d33fa7551af0ead6 Mon Sep 17 00:00:00 2001 From: Dafydd Jones Date: Sun, 10 Nov 2024 22:33:43 +0000 Subject: [PATCH 2/6] fix(deps): update pre-commit hook pre-commit/pre-commit-hooks to v5 --- template/.pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/.pre-commit-config.yaml b/template/.pre-commit-config.yaml index 92f421d..cbad4da 100644 --- a/template/.pre-commit-config.yaml +++ b/template/.pre-commit-config.yaml @@ -2,7 +2,7 @@ # 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 From 10af2aea92b43dc5a9bb9cfd58ff3be881e1649d Mon Sep 17 00:00:00 2001 From: Dafydd Jones Date: Sun, 10 Nov 2024 22:33:57 +0000 Subject: [PATCH 3/6] fix(deps): update pre-commit hook python-jsonschema/check-jsonschema to v0.29.4 --- template/.pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/.pre-commit-config.yaml b/template/.pre-commit-config.yaml index cbad4da..87520b4 100644 --- a/template/.pre-commit-config.yaml +++ b/template/.pre-commit-config.yaml @@ -10,7 +10,7 @@ repos: - 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 From 25f623c8489d32f0c1104a0a781b6665ed78364e Mon Sep 17 00:00:00 2001 From: Dafydd Jones Date: Sun, 10 Nov 2024 22:36:18 +0000 Subject: [PATCH 4/6] fix(deps): update actions/checkout action to v4.2.2 --- template/.github/workflows/libbuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/.github/workflows/libbuild.yml b/template/.github/workflows/libbuild.yml index 3519871..60b02d5 100644 --- a/template/.github/workflows/libbuild.yml +++ b/template/.github/workflows/libbuild.yml @@ -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 From b066fb7dd723dbbee497fd70b15007a83d1cac4b Mon Sep 17 00:00:00 2001 From: Dafydd Jones Date: Sun, 10 Nov 2024 22:38:04 +0000 Subject: [PATCH 5/6] fix(workflows): changes for working with newer macOS runners & Vagrant 2.4.2 --- template/.github/workflows/libbuild.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/template/.github/workflows/libbuild.yml b/template/.github/workflows/libbuild.yml index 60b02d5..7098b18 100644 --- a/template/.github/workflows/libbuild.yml +++ b/template/.github/workflows/libbuild.yml @@ -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 @@ -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 From 8f5ead2b5eae8b6059232a788c1ba564fc4386df Mon Sep 17 00:00:00 2001 From: Dafydd Jones Date: Sun, 10 Nov 2024 22:38:44 +0000 Subject: [PATCH 6/6] test: approve new changes --- test/SetBoxName/libbuild_yml.tt | 10 +++++++--- test/SetBoxName/pre-commit_yaml.tt | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/test/SetBoxName/libbuild_yml.tt b/test/SetBoxName/libbuild_yml.tt index 3519871..7098b18 100644 --- a/test/SetBoxName/libbuild_yml.tt +++ b/test/SetBoxName/libbuild_yml.tt @@ -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 @@ -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 @@ -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 diff --git a/test/SetBoxName/pre-commit_yaml.tt b/test/SetBoxName/pre-commit_yaml.tt index 92f421d..87520b4 100644 --- a/test/SetBoxName/pre-commit_yaml.tt +++ b/test/SetBoxName/pre-commit_yaml.tt @@ -2,7 +2,7 @@ # 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 @@ -10,7 +10,7 @@ repos: - 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