From 752067124beb8fe2b9c5862fec1dbc6ae37aa5e2 Mon Sep 17 00:00:00 2001 From: Dafydd Jones Date: Mon, 2 Sep 2024 16:04:01 +0100 Subject: [PATCH] chore(deps): update dependency https://github.com/dafyddh/copier-packer-build to v1.1.6 --- .copier-answers.yml | 4 ++-- .github/renovate.json5 | 27 ++++++++------------------- .github/workflows/libbuild.yml | 8 ++++++-- .pre-commit-config.yaml | 2 +- 4 files changed, 17 insertions(+), 24 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 9a34f6d..10e832b 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,4 +1,4 @@ # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY -_commit: v1.1.3 -_src_path: gh:dafyddj/copier-packer-build +_commit: v1.1.6 +_src_path: https://github.com/dafyddj/copier-packer-build box_name: techneg/tkl17-x64-nocm diff --git a/.github/renovate.json5 b/.github/renovate.json5 index a9b318a..1223d33 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -1,31 +1,20 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "enabledManagers": [ - "custom.regex", + "copier", "git-submodules", ], "extends": [ "config:recommended", ], - // `copier` template updates - // There are two conditions that we need to account for - // * a "clean" `.copier-answers.yml` file - // * update needed but not yet applied (and further updates could appear in this condition) - // `renovate` needs to be able to match both conditions for PRs to work properly - // We make a hacky use of the otherwise unused field `currentDigest` to hold the current copier template version - "customManagers": [ - { - "customType": "regex", - "fileMatch": ["^.copier-answers.yml$"], - "matchStrings": [ - "_commit: (?\\S+)\\n_src_path: gh:(?\\S+)\\n", - "_commit: (?\\S+) # __copier_update_needed (?\\S+)\\n_src_path: gh:(?\\S+)\\n", - ], - "datasourceTemplate": "github-tags", - "autoReplaceStringTemplate": "_commit: {{#if currentDigest}}{{{currentDigest}}}{{else}}{{{currentValue}}}{{/if}} # __copier_update_needed {{{newValue}}}\n_src_path: gh:{{{depName}}}\n", - }, - ], "git-submodules": { "enabled": true }, + "packageRules": [ + { + "matchManagers": ["git-submodules"], + "automerge": true, + }, + ], + "platformAutomerge": false, } diff --git a/.github/workflows/libbuild.yml b/.github/workflows/libbuild.yml index d1ae237..35ee05f 100644 --- a/.github/workflows/libbuild.yml +++ b/.github/workflows/libbuild.yml @@ -32,7 +32,7 @@ jobs: MAKE_VARS: "" steps: - name: Checkout repository - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Debug on runner (When re-run with "Enable debug logging" checked) if: runner.debug uses: mxschmitt/action-tmate@a283f9441d2d96eb62436dc46d7014f5d357ac22 # v3 @@ -45,6 +45,10 @@ jobs: run: | kernel_name=$(uname -s) if [ "$kernel_name" == "Linux" ]; then + 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 --yes install vagrant $TECHNEG_VAGRANT_PROVIDER elif [ "$kernel_name" == "Darwin" ]; then @@ -72,7 +76,7 @@ jobs: uses: actionshub/chef-install@d41f8dde8642d5cd05abefa333fbf2784cff830c # 3.0.0 env: # renovate: datasource=github-tags depName=chef/chef-workstation - CHEF_WS_VERSION: 24.2.1058 + CHEF_WS_VERSION: 24.4.1064 with: project: chef-workstation version: ${{ env.CHEF_WS_VERSION }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 068985b..92f421d 100644 --- a/.pre-commit-config.yaml +++ b/.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.28.3 + rev: 0.29.2 hooks: - id: check-github-workflows name: Check GitHub workflows with check-jsonschema