Merge pull request #14 from dafyddj/chore/copier

fix(deps): update dependency https://github.com/dafyddj/copier-bootstrap to v2.1.3

.copier-answers.yml

@@ -1,4 +1,4 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: v2.0.10 # __copier_update_available v2.0.15
-_src_path: gh:dafyddj/copier-bootstrap
+_commit: v2.1.3
+_src_path: https://github.com/dafyddj/copier-bootstrap
 template_name: copier-packer-build

.github/renovate.json5

@@ -1,31 +1,12 @@
 {
   "$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: (?<currentValue>\\S+)\\n_src_path: gh:(?<depName>\\S+)\\n",
-        "_commit: (?<currentDigest>\\S+) # __copier_update_available (?<currentValue>\\S+)\\n_src_path: gh:(?<depName>\\S+)\\n",
-        "_commit: (?<currentDigest>\\S+) # __copier_update_needed (?<currentValue>\\S+)\\n_src_path: gh:(?<depName>\\S+)\\n",
-      ],
-      "datasourceTemplate": "github-tags",
-      "autoReplaceStringTemplate": "_commit: {{#if currentDigest}}{{{currentDigest}}}{{else}}{{{currentValue}}}{{/if}} # __copier_update_available {{{newValue}}}\n_src_path: gh:{{{depName}}}\n",
-    },
-  ],
   "git-submodules": {
     "enabled": true
   },
@@ -34,10 +15,6 @@
       "matchManagers": ["git-submodules"],
       "automerge": true,
     },
-    {
-      "matchManagers": ["custom.regex"],
-      "commitMessageSuffix": "available",
-    },
   ],
   "platformAutomerge": false,
 }

.github/workflows/main.yml

@@ -26,10 +26,10 @@ jobs:
     runs-on: ubuntu-latest
     env:
       # renovate: datasource=github-releases depName=actions/python-versions extractVersion=^(?<version>\S+)-\d+$
-      PYTHON_VERSION: 3.12.3
+      PYTHON_VERSION: 3.12.5
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
-      - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
@@ -39,7 +39,7 @@ jobs:
     if: fromJSON(needs.should-run.outputs.should-run)
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           fetch-depth: 0      # `copier` prefers full-history clones
           submodules: true
@@ -63,8 +63,8 @@ jobs:
       contents: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
-      - uses: codfish/semantic-release-action@b0e57c976bf8f74b2454f59a30e4a1b5f11727b4 # v3.3.0
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: codfish/semantic-release-action@9a999e0cdb207de2c9d9d4276860435727818989 # v3.4.1
         with:
           plugins: |
             [ "@semantic-release/commit-analyzer",

.pre-commit-config.yaml

@@ -9,7 +9,7 @@ repos:
         args: [--assume-in-merge]
       - id: check-yaml
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.28.4
+    rev: 0.29.2
     hooks:
       - id: check-github-workflows
         name: Check GitHub workflows with check-jsonschema

template/.github/renovate.json5

@@ -1,31 +1,12 @@
 {
   "$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: (?<currentValue>\\S+)\\n_src_path: gh:(?<depName>\\S+)\\n",
-        "_commit: (?<currentDigest>\\S+) # __copier_update_available (?<currentValue>\\S+)\\n_src_path: gh:(?<depName>\\S+)\\n",
-        "_commit: (?<currentDigest>\\S+) # __copier_update_needed (?<currentValue>\\S+)\\n_src_path: gh:(?<depName>\\S+)\\n",
-      ],
-      "datasourceTemplate": "github-tags",
-      "autoReplaceStringTemplate": "_commit: {{#if currentDigest}}{{{currentDigest}}}{{else}}{{{currentValue}}}{{/if}} # __copier_update_available {{{newValue}}}\n_src_path: gh:{{{depName}}}\n",
-    },
-  ],
   "git-submodules": {
     "enabled": true
   },
@@ -34,10 +15,6 @@
       "matchManagers": ["git-submodules"],
       "automerge": true,
     },
-    {
-      "matchManagers": ["custom.regex"],
-      "commitMessageSuffix": "available",
-    },
   ],
   "platformAutomerge": false,
 }

test/GenerateProject/catalogue.tt

@@ -2,12 +2,9 @@ The following new files/directories were created:
 <Test Directory>
 ----.copier-answers.yml
 ----.github
---------copier-renovate.json5
---------entrypoint.sh
 --------renovate.json5
 --------workflows
 ------------libbuild.yml
-------------renovate.yml
 ----.gitignore
 ----.pre-commit-config.yaml
 ----bin

test/GenerateProject/stderr.tt

@@ -1,7 +1,7 @@
-/opt/homebrew/Cellar/copier/9.2.0/libexec/lib/python3.12/site-packages/copier/vcs.py:202: DirtyLocalWarning: Dirty template changes included automatically.
+/opt/homebrew/Cellar/copier/9.1.1/libexec/lib/python3.12/site-packages/copier/vcs.py:200: DirtyLocalWarning: Dirty template changes included automatically.
   warn(
 
-Copying from template version 0.0.0.post2.dev0+2261517
+Copying from template version 1.3.2.post1.dev0+c6db195
  identical  .
     create  .copier-answers.yml
     create  .github

test/SetBoxName/catalogue.tt

@@ -2,12 +2,9 @@ The following new files/directories were created:
 <Test Directory>
 ----.copier-answers.yml
 ----.github
---------copier-renovate.json5
---------entrypoint.sh
 --------renovate.json5
 --------workflows
 ------------libbuild.yml
-------------renovate.yml
 ----.gitignore
 ----.pre-commit-config.yaml
 ----bin