From 23d442a2a4f13f5bba4cc384085afb450bf02b10 Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Sun, 28 Apr 2024 16:34:48 +0800 Subject: [PATCH 01/14] chore: update template when pin digest for docker --- .renovaterc.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.renovaterc.json b/.renovaterc.json index 6a62e6f7..fc1f32ef 100644 --- a/.renovaterc.json +++ b/.renovaterc.json @@ -97,7 +97,8 @@ ], "postUpgradeTasks": { "commands": [ - "find template -type f -exec sed -i 's|{{{depName}}}@{{{currentDigest}}} # {{{currentValue}}}|{{{depName}}}@{{{newDigest}}} # {{{newValue}}}|g' {} +" + "find template -type f -exec sed -i 's|{{{depName}}}@{{{currentDigest}}} # {{{currentValue}}}|{{{depName}}}@{{{newDigest}}} # {{{newValue}}}|g' {} +", + "find template -type f -exec sed -i 's|{{{depName}}}@{{{currentValue}}}|{{{depName}}}@{{{newDigest}}} # {{{newValue}}}|g' {} +" ] } }, From 7810d628c3af53db827c49284eaf10a8ab13f8d6 Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Sun, 28 Apr 2024 16:41:33 +0800 Subject: [PATCH 02/14] update template --- template/.renovaterc.json.jinja | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/template/.renovaterc.json.jinja b/template/.renovaterc.json.jinja index d733eb53..2a4ea6f8 100644 --- a/template/.renovaterc.json.jinja +++ b/template/.renovaterc.json.jinja @@ -107,7 +107,8 @@ ], "postUpgradeTasks": { "commands": [ - "find template -type f -exec sed -i {{ '\'s|{{{depName}}}@{{{currentDigest}}} # {{{currentValue}}}|{{{depName}}}@{{{newDigest}}} # {{{newValue}}}|g\' {} +' }}" + "find template -type f -exec sed -i {{ '\'s|{{{depName}}}@{{{currentDigest}}} # {{{currentValue}}}|{{{depName}}}@{{{newDigest}}} # {{{newValue}}}|g\' {} +' }}", + "find template -type f -exec sed -i {{ '\'s|{{{depName}}}@{{{currentValue}}}|{{{depName}}}@{{{newDigest}}} # {{{newValue}}}|g\' {} +' }}" ] } }, From a04f104f8499d121257a63db89fbf4594b7a161e Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Sun, 28 Apr 2024 17:00:27 +0800 Subject: [PATCH 03/14] enable both for docker and actions --- .renovaterc.json | 3 ++- template/.renovaterc.json.jinja | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.renovaterc.json b/.renovaterc.json index fc1f32ef..de8b4b8e 100644 --- a/.renovaterc.json +++ b/.renovaterc.json @@ -131,7 +131,8 @@ ], "postUpgradeTasks": { "commands": [ - "find template -type f -exec sed -i 's|{{{depName}}}:{{{currentValue}}}@{{{currentDigest}}}|{{{depName}}}:{{{newValue}}}@{{{newDigest}}}|g' {} +" + "find template -type f -exec sed -i 's|{{{depName}}}:{{{currentValue}}}@{{{currentDigest}}}|{{{depName}}}:{{{newValue}}}@{{{newDigest}}}|g' {} +", + "find template -type f -exec sed -i 's|{{{depName}}}:{{{currentValue}}}|{{{depName}}}:{{{newValue}}}@{{{newDigest}}}|g' {} +" ] } }, diff --git a/template/.renovaterc.json.jinja b/template/.renovaterc.json.jinja index 2a4ea6f8..c85522cf 100644 --- a/template/.renovaterc.json.jinja +++ b/template/.renovaterc.json.jinja @@ -141,7 +141,8 @@ ], "postUpgradeTasks": { "commands": [ - "find template -type f -exec sed -i {{ '\'s|{{{depName}}}:{{{currentValue}}}@{{{currentDigest}}}|{{{depName}}}:{{{newValue}}}@{{{newDigest}}}|g\' {} +' }}" + "find template -type f -exec sed -i {{ '\'s|{{{depName}}}:{{{currentValue}}}@{{{currentDigest}}}|{{{depName}}}:{{{newValue}}}@{{{newDigest}}}|g\' {} +' }}", + "find template -type f -exec sed -i {{ '\'s|{{{depName}}}:{{{currentValue}}}|{{{depName}}}:{{{newValue}}}@{{{newDigest}}}|g\' {} +' }}" ] } }, From 097fbf69771bf9b5111bc723ebf2994f0bb724aa Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Sun, 28 Apr 2024 17:25:56 +0800 Subject: [PATCH 04/14] apply branch execution mode --- .renovaterc.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.renovaterc.json b/.renovaterc.json index de8b4b8e..fb789601 100644 --- a/.renovaterc.json +++ b/.renovaterc.json @@ -99,7 +99,8 @@ "commands": [ "find template -type f -exec sed -i 's|{{{depName}}}@{{{currentDigest}}} # {{{currentValue}}}|{{{depName}}}@{{{newDigest}}} # {{{newValue}}}|g' {} +", "find template -type f -exec sed -i 's|{{{depName}}}@{{{currentValue}}}|{{{depName}}}@{{{newDigest}}} # {{{newValue}}}|g' {} +" - ] + ], + "executionMode": "branch" } }, { @@ -109,7 +110,8 @@ "postUpgradeTasks": { "commands": [ "find template -type f -exec sed -i 's|{{{depName}}}-{{{currentValue}}}|{{{depName}}}-{{{newValue}}}|g' {} +" - ] + ], + "executionMode": "branch" } }, { @@ -119,7 +121,8 @@ "postUpgradeTasks": { "commands": [ "find template -type f -name '.pre-commit-config.yaml.jinja' -exec sed -i '/{{{replace \"/\" \"\\/\" depName}}}/{N;s/rev: {{{currentValue}}}/rev: {{{newValue}}}/}' {} +" - ] + ], + "executionMode": "branch" } }, { @@ -133,7 +136,8 @@ "commands": [ "find template -type f -exec sed -i 's|{{{depName}}}:{{{currentValue}}}@{{{currentDigest}}}|{{{depName}}}:{{{newValue}}}@{{{newDigest}}}|g' {} +", "find template -type f -exec sed -i 's|{{{depName}}}:{{{currentValue}}}|{{{depName}}}:{{{newValue}}}@{{{newDigest}}}|g' {} +" - ] + ], + "executionMode": "branch" } }, { From 1cd768591c6e508faf73621fbb4df110abbd35f0 Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Sun, 28 Apr 2024 17:26:17 +0800 Subject: [PATCH 05/14] match EOL explicitly for pin docker images --- .renovaterc.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.renovaterc.json b/.renovaterc.json index fb789601..bca3882a 100644 --- a/.renovaterc.json +++ b/.renovaterc.json @@ -135,7 +135,7 @@ "postUpgradeTasks": { "commands": [ "find template -type f -exec sed -i 's|{{{depName}}}:{{{currentValue}}}@{{{currentDigest}}}|{{{depName}}}:{{{newValue}}}@{{{newDigest}}}|g' {} +", - "find template -type f -exec sed -i 's|{{{depName}}}:{{{currentValue}}}|{{{depName}}}:{{{newValue}}}@{{{newDigest}}}|g' {} +" + "find template -type f -exec sed -i 's|{{{depName}}}:{{{currentValue}}}$|{{{depName}}}:{{{newValue}}}@{{{newDigest}}}|g' {} +" ], "executionMode": "branch" } From dd92283f5bad7e07f617381d50bfe49636462f8c Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Sun, 28 Apr 2024 17:27:37 +0800 Subject: [PATCH 06/14] fake release-cli for test --- .gitlab/workflows/release.yml | 2 +- .../workflows/release.yml.jinja | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab/workflows/release.yml b/.gitlab/workflows/release.yml index 4724ece3..3ab157b7 100644 --- a/.gitlab/workflows/release.yml +++ b/.gitlab/workflows/release.yml @@ -12,7 +12,7 @@ pages-build: - make release-notes > release-notes.md stage: release release-publish: - image: registry.gitlab.com/gitlab-org/release-cli:v0.17.0@sha256:f3dceff8dfe5d5e1c7a37d0d28bebc47669be80caa6d98d37c949f846d2e63e8 + image: registry.gitlab.com/gitlab-org/release-cli:v0.17.0 needs: - pages-build release: diff --git a/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/release.yml.jinja b/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/release.yml.jinja index e425afc3..a65af968 100644 --- a/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/release.yml.jinja +++ b/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/release.yml.jinja @@ -13,7 +13,7 @@ pages-build: - make release-notes > release-notes.md stage: release release-publish: - image: registry.gitlab.com/gitlab-org/release-cli:v0.17.0@sha256:f3dceff8dfe5d5e1c7a37d0d28bebc47669be80caa6d98d37c949f846d2e63e8 + image: registry.gitlab.com/gitlab-org/release-cli:v0.17.0 needs: - pages-build release: From 27ca729b896d41a35687d50a996a21e197623a07 Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Sun, 28 Apr 2024 17:29:07 +0800 Subject: [PATCH 07/14] fake docker image for test --- .gitlab/workflows/devcontainer.yml | 2 +- .../workflows/devcontainer.yml.jinja | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab/workflows/devcontainer.yml b/.gitlab/workflows/devcontainer.yml index 61cf9370..e8566111 100644 --- a/.gitlab/workflows/devcontainer.yml +++ b/.gitlab/workflows/devcontainer.yml @@ -1,5 +1,5 @@ dev-container-publish: - image: docker:26.0.2@sha256:c8d3a4b0f8c9f09c8d220fc68028a401f5b7f5c159a7dd62fc0915f8617ea66f + image: docker:26.0.2 parallel: matrix: - PYTHON_VERSION: diff --git a/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/devcontainer.yml.jinja b/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/devcontainer.yml.jinja index 494f76c9..89060646 100644 --- a/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/devcontainer.yml.jinja +++ b/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/devcontainer.yml.jinja @@ -1,6 +1,6 @@ [% from pathjoin("includes", "version_compare.jinja") import version_between -%] dev-container-publish: - image: docker:26.0.2@sha256:c8d3a4b0f8c9f09c8d220fc68028a401f5b7f5c159a7dd62fc0915f8617ea66f + image: docker:26.0.2 parallel: matrix: - PYTHON_VERSION: From 5b42ce61cee7e392304c8b023134df6fcb48382f Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Sun, 28 Apr 2024 17:38:16 +0800 Subject: [PATCH 08/14] update template --- template/.renovaterc.json.jinja | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/template/.renovaterc.json.jinja b/template/.renovaterc.json.jinja index c85522cf..3f35ebb2 100644 --- a/template/.renovaterc.json.jinja +++ b/template/.renovaterc.json.jinja @@ -109,7 +109,8 @@ "commands": [ "find template -type f -exec sed -i {{ '\'s|{{{depName}}}@{{{currentDigest}}} # {{{currentValue}}}|{{{depName}}}@{{{newDigest}}} # {{{newValue}}}|g\' {} +' }}", "find template -type f -exec sed -i {{ '\'s|{{{depName}}}@{{{currentValue}}}|{{{depName}}}@{{{newDigest}}} # {{{newValue}}}|g\' {} +' }}" - ] + ], + "executionMode": "branch" } }, { @@ -119,7 +120,8 @@ "postUpgradeTasks": { "commands": [ "find template -type f -exec sed -i {{ '\'s|{{{depName}}}-{{{currentValue}}}|{{{depName}}}-{{{newValue}}}|g\' {} +' }}" - ] + ], + "executionMode": "branch" } }, { @@ -129,7 +131,8 @@ "postUpgradeTasks": { "commands": [ "find template -type f -name '.pre-commit-config.yaml.jinja' -exec sed -i {{ '\'/{{{replace \\"/\\" \\"\\\\/\\" depName}}}/{N;s/rev: {{{currentValue}}}/rev: {{{newValue}}}/}\'' }} {} +" - ] + ], + "executionMode": "branch" } }, { @@ -142,8 +145,9 @@ "postUpgradeTasks": { "commands": [ "find template -type f -exec sed -i {{ '\'s|{{{depName}}}:{{{currentValue}}}@{{{currentDigest}}}|{{{depName}}}:{{{newValue}}}@{{{newDigest}}}|g\' {} +' }}", - "find template -type f -exec sed -i {{ '\'s|{{{depName}}}:{{{currentValue}}}|{{{depName}}}:{{{newValue}}}@{{{newDigest}}}|g\' {} +' }}" - ] + "find template -type f -exec sed -i {{ '\'s|{{{depName}}}:{{{currentValue}}}$|{{{depName}}}:{{{newValue}}}@{{{newDigest}}}|g\' {} +' }}" + ], + "executionMode": "branch" } }, { From cb160ed679618681ff2692786b3f21f41f864fef Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Sun, 28 Apr 2024 17:42:05 +0800 Subject: [PATCH 09/14] revert the branch execution mode --- .renovaterc.json | 12 ++++-------- template/.renovaterc.json.jinja | 12 ++++-------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/.renovaterc.json b/.renovaterc.json index bca3882a..8fb4e7f0 100644 --- a/.renovaterc.json +++ b/.renovaterc.json @@ -99,8 +99,7 @@ "commands": [ "find template -type f -exec sed -i 's|{{{depName}}}@{{{currentDigest}}} # {{{currentValue}}}|{{{depName}}}@{{{newDigest}}} # {{{newValue}}}|g' {} +", "find template -type f -exec sed -i 's|{{{depName}}}@{{{currentValue}}}|{{{depName}}}@{{{newDigest}}} # {{{newValue}}}|g' {} +" - ], - "executionMode": "branch" + ] } }, { @@ -110,8 +109,7 @@ "postUpgradeTasks": { "commands": [ "find template -type f -exec sed -i 's|{{{depName}}}-{{{currentValue}}}|{{{depName}}}-{{{newValue}}}|g' {} +" - ], - "executionMode": "branch" + ] } }, { @@ -121,8 +119,7 @@ "postUpgradeTasks": { "commands": [ "find template -type f -name '.pre-commit-config.yaml.jinja' -exec sed -i '/{{{replace \"/\" \"\\/\" depName}}}/{N;s/rev: {{{currentValue}}}/rev: {{{newValue}}}/}' {} +" - ], - "executionMode": "branch" + ] } }, { @@ -136,8 +133,7 @@ "commands": [ "find template -type f -exec sed -i 's|{{{depName}}}:{{{currentValue}}}@{{{currentDigest}}}|{{{depName}}}:{{{newValue}}}@{{{newDigest}}}|g' {} +", "find template -type f -exec sed -i 's|{{{depName}}}:{{{currentValue}}}$|{{{depName}}}:{{{newValue}}}@{{{newDigest}}}|g' {} +" - ], - "executionMode": "branch" + ] } }, { diff --git a/template/.renovaterc.json.jinja b/template/.renovaterc.json.jinja index 3f35ebb2..f8a9df60 100644 --- a/template/.renovaterc.json.jinja +++ b/template/.renovaterc.json.jinja @@ -109,8 +109,7 @@ "commands": [ "find template -type f -exec sed -i {{ '\'s|{{{depName}}}@{{{currentDigest}}} # {{{currentValue}}}|{{{depName}}}@{{{newDigest}}} # {{{newValue}}}|g\' {} +' }}", "find template -type f -exec sed -i {{ '\'s|{{{depName}}}@{{{currentValue}}}|{{{depName}}}@{{{newDigest}}} # {{{newValue}}}|g\' {} +' }}" - ], - "executionMode": "branch" + ] } }, { @@ -120,8 +119,7 @@ "postUpgradeTasks": { "commands": [ "find template -type f -exec sed -i {{ '\'s|{{{depName}}}-{{{currentValue}}}|{{{depName}}}-{{{newValue}}}|g\' {} +' }}" - ], - "executionMode": "branch" + ] } }, { @@ -131,8 +129,7 @@ "postUpgradeTasks": { "commands": [ "find template -type f -name '.pre-commit-config.yaml.jinja' -exec sed -i {{ '\'/{{{replace \\"/\\" \\"\\\\/\\" depName}}}/{N;s/rev: {{{currentValue}}}/rev: {{{newValue}}}/}\'' }} {} +" - ], - "executionMode": "branch" + ] } }, { @@ -146,8 +143,7 @@ "commands": [ "find template -type f -exec sed -i {{ '\'s|{{{depName}}}:{{{currentValue}}}@{{{currentDigest}}}|{{{depName}}}:{{{newValue}}}@{{{newDigest}}}|g\' {} +' }}", "find template -type f -exec sed -i {{ '\'s|{{{depName}}}:{{{currentValue}}}$|{{{depName}}}:{{{newValue}}}@{{{newDigest}}}|g\' {} +' }}" - ], - "executionMode": "branch" + ] } }, { From f98c47170f1443ffe9ddf2c9fa5f49ada3594f74 Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Sun, 28 Apr 2024 17:58:21 +0800 Subject: [PATCH 10/14] fix --- .renovaterc.json | 2 +- template/.renovaterc.json.jinja | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.renovaterc.json b/.renovaterc.json index 8fb4e7f0..48fcfe73 100644 --- a/.renovaterc.json +++ b/.renovaterc.json @@ -131,7 +131,7 @@ ], "postUpgradeTasks": { "commands": [ - "find template -type f -exec sed -i 's|{{{depName}}}:{{{currentValue}}}@{{{currentDigest}}}|{{{depName}}}:{{{newValue}}}@{{{newDigest}}}|g' {} +", + "find template -type f -exec sed -i 's|{{{depName}}}:{{{currentValue}}}@{{{currentDigest}}}$|{{{depName}}}:{{{newValue}}}@{{{newDigest}}}|g' {} +", "find template -type f -exec sed -i 's|{{{depName}}}:{{{currentValue}}}$|{{{depName}}}:{{{newValue}}}@{{{newDigest}}}|g' {} +" ] } diff --git a/template/.renovaterc.json.jinja b/template/.renovaterc.json.jinja index f8a9df60..52cc62cd 100644 --- a/template/.renovaterc.json.jinja +++ b/template/.renovaterc.json.jinja @@ -141,7 +141,7 @@ ], "postUpgradeTasks": { "commands": [ - "find template -type f -exec sed -i {{ '\'s|{{{depName}}}:{{{currentValue}}}@{{{currentDigest}}}|{{{depName}}}:{{{newValue}}}@{{{newDigest}}}|g\' {} +' }}", + "find template -type f -exec sed -i {{ '\'s|{{{depName}}}:{{{currentValue}}}@{{{currentDigest}}}$|{{{depName}}}:{{{newValue}}}@{{{newDigest}}}|g\' {} +' }}", "find template -type f -exec sed -i {{ '\'s|{{{depName}}}:{{{currentValue}}}$|{{{depName}}}:{{{newValue}}}@{{{newDigest}}}|g\' {} +' }}" ] } From 8ed7757473aee55063606cb92f239e512efb4cb7 Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Sun, 28 Apr 2024 18:14:14 +0800 Subject: [PATCH 11/14] Revert "fake docker image for test" This reverts commit 00ff34f2d00b7b9e6938d1bab51c0b67489bf9cb. --- .gitlab/workflows/devcontainer.yml | 2 +- .../workflows/devcontainer.yml.jinja | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab/workflows/devcontainer.yml b/.gitlab/workflows/devcontainer.yml index e8566111..61cf9370 100644 --- a/.gitlab/workflows/devcontainer.yml +++ b/.gitlab/workflows/devcontainer.yml @@ -1,5 +1,5 @@ dev-container-publish: - image: docker:26.0.2 + image: docker:26.0.2@sha256:c8d3a4b0f8c9f09c8d220fc68028a401f5b7f5c159a7dd62fc0915f8617ea66f parallel: matrix: - PYTHON_VERSION: diff --git a/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/devcontainer.yml.jinja b/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/devcontainer.yml.jinja index 89060646..494f76c9 100644 --- a/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/devcontainer.yml.jinja +++ b/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/devcontainer.yml.jinja @@ -1,6 +1,6 @@ [% from pathjoin("includes", "version_compare.jinja") import version_between -%] dev-container-publish: - image: docker:26.0.2 + image: docker:26.0.2@sha256:c8d3a4b0f8c9f09c8d220fc68028a401f5b7f5c159a7dd62fc0915f8617ea66f parallel: matrix: - PYTHON_VERSION: From 91ce78b15dba60b39e2c2099694e1700b398a16f Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Sun, 28 Apr 2024 18:14:21 +0800 Subject: [PATCH 12/14] Revert "fake release-cli for test" This reverts commit 0405177dd1ce2beb5826bf48e48a0bed5cfdbcf6. --- .gitlab/workflows/release.yml | 2 +- .../workflows/release.yml.jinja | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab/workflows/release.yml b/.gitlab/workflows/release.yml index 3ab157b7..4724ece3 100644 --- a/.gitlab/workflows/release.yml +++ b/.gitlab/workflows/release.yml @@ -12,7 +12,7 @@ pages-build: - make release-notes > release-notes.md stage: release release-publish: - image: registry.gitlab.com/gitlab-org/release-cli:v0.17.0 + image: registry.gitlab.com/gitlab-org/release-cli:v0.17.0@sha256:f3dceff8dfe5d5e1c7a37d0d28bebc47669be80caa6d98d37c949f846d2e63e8 needs: - pages-build release: diff --git a/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/release.yml.jinja b/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/release.yml.jinja index a65af968..e425afc3 100644 --- a/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/release.yml.jinja +++ b/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/release.yml.jinja @@ -13,7 +13,7 @@ pages-build: - make release-notes > release-notes.md stage: release release-publish: - image: registry.gitlab.com/gitlab-org/release-cli:v0.17.0 + image: registry.gitlab.com/gitlab-org/release-cli:v0.17.0@sha256:f3dceff8dfe5d5e1c7a37d0d28bebc47669be80caa6d98d37c949f846d2e63e8 needs: - pages-build release: From f29b72a991cee2818588dc83afd2225e1a77620a Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Sun, 28 Apr 2024 18:18:05 +0800 Subject: [PATCH 13/14] minor --- .renovaterc.json | 18 +++++++++--------- template/.renovaterc.json.jinja | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.renovaterc.json b/.renovaterc.json index 48fcfe73..286bc5e1 100644 --- a/.renovaterc.json +++ b/.renovaterc.json @@ -93,32 +93,32 @@ "packageRules": [ { "matchDepTypes": [ - "action" + "github-runner" ], "postUpgradeTasks": { "commands": [ - "find template -type f -exec sed -i 's|{{{depName}}}@{{{currentDigest}}} # {{{currentValue}}}|{{{depName}}}@{{{newDigest}}} # {{{newValue}}}|g' {} +", - "find template -type f -exec sed -i 's|{{{depName}}}@{{{currentValue}}}|{{{depName}}}@{{{newDigest}}} # {{{newValue}}}|g' {} +" + "find template -type f -exec sed -i 's|{{{depName}}}-{{{currentValue}}}|{{{depName}}}-{{{newValue}}}|g' {} +" ] } }, { - "matchDepTypes": [ - "github-runner" + "matchManagers": [ + "pre-commit" ], "postUpgradeTasks": { "commands": [ - "find template -type f -exec sed -i 's|{{{depName}}}-{{{currentValue}}}|{{{depName}}}-{{{newValue}}}|g' {} +" + "find template -type f -name '.pre-commit-config.yaml.jinja' -exec sed -i '/{{{replace \"/\" \"\\/\" depName}}}/{N;s/rev: {{{currentValue}}}/rev: {{{newValue}}}/}' {} +" ] } }, { - "matchManagers": [ - "pre-commit" + "matchDepTypes": [ + "action" ], "postUpgradeTasks": { "commands": [ - "find template -type f -name '.pre-commit-config.yaml.jinja' -exec sed -i '/{{{replace \"/\" \"\\/\" depName}}}/{N;s/rev: {{{currentValue}}}/rev: {{{newValue}}}/}' {} +" + "find template -type f -exec sed -i 's|{{{depName}}}@{{{currentDigest}}} # {{{currentValue}}}|{{{depName}}}@{{{newDigest}}} # {{{newValue}}}|g' {} +", + "find template -type f -exec sed -i 's|{{{depName}}}@{{{currentValue}}}|{{{depName}}}@{{{newDigest}}} # {{{newValue}}}|g' {} +" ] } }, diff --git a/template/.renovaterc.json.jinja b/template/.renovaterc.json.jinja index 52cc62cd..9084ba0d 100644 --- a/template/.renovaterc.json.jinja +++ b/template/.renovaterc.json.jinja @@ -103,32 +103,32 @@ [%- if project_name == "Serious Scaffold Python" %] { "matchDepTypes": [ - "action" + "github-runner" ], "postUpgradeTasks": { "commands": [ - "find template -type f -exec sed -i {{ '\'s|{{{depName}}}@{{{currentDigest}}} # {{{currentValue}}}|{{{depName}}}@{{{newDigest}}} # {{{newValue}}}|g\' {} +' }}", - "find template -type f -exec sed -i {{ '\'s|{{{depName}}}@{{{currentValue}}}|{{{depName}}}@{{{newDigest}}} # {{{newValue}}}|g\' {} +' }}" + "find template -type f -exec sed -i {{ '\'s|{{{depName}}}-{{{currentValue}}}|{{{depName}}}-{{{newValue}}}|g\' {} +' }}" ] } }, { - "matchDepTypes": [ - "github-runner" + "matchManagers": [ + "pre-commit" ], "postUpgradeTasks": { "commands": [ - "find template -type f -exec sed -i {{ '\'s|{{{depName}}}-{{{currentValue}}}|{{{depName}}}-{{{newValue}}}|g\' {} +' }}" + "find template -type f -name '.pre-commit-config.yaml.jinja' -exec sed -i {{ '\'/{{{replace \\"/\\" \\"\\\\/\\" depName}}}/{N;s/rev: {{{currentValue}}}/rev: {{{newValue}}}/}\'' }} {} +" ] } }, { - "matchManagers": [ - "pre-commit" + "matchDepTypes": [ + "action" ], "postUpgradeTasks": { "commands": [ - "find template -type f -name '.pre-commit-config.yaml.jinja' -exec sed -i {{ '\'/{{{replace \\"/\\" \\"\\\\/\\" depName}}}/{N;s/rev: {{{currentValue}}}/rev: {{{newValue}}}/}\'' }} {} +" + "find template -type f -exec sed -i {{ '\'s|{{{depName}}}@{{{currentDigest}}} # {{{currentValue}}}|{{{depName}}}@{{{newDigest}}} # {{{newValue}}}|g\' {} +' }}", + "find template -type f -exec sed -i {{ '\'s|{{{depName}}}@{{{currentValue}}}|{{{depName}}}@{{{newDigest}}} # {{{newValue}}}|g\' {} +' }}" ] } }, From ee5ed27012fe177662472bb24c04589454dcaff1 Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Sun, 28 Apr 2024 18:19:18 +0800 Subject: [PATCH 14/14] Revert "minor" This reverts commit c48e6d09b1d1a6f07b083eadb215ab00db19cd95. --- .renovaterc.json | 18 +++++++++--------- template/.renovaterc.json.jinja | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.renovaterc.json b/.renovaterc.json index 286bc5e1..48fcfe73 100644 --- a/.renovaterc.json +++ b/.renovaterc.json @@ -93,32 +93,32 @@ "packageRules": [ { "matchDepTypes": [ - "github-runner" + "action" ], "postUpgradeTasks": { "commands": [ - "find template -type f -exec sed -i 's|{{{depName}}}-{{{currentValue}}}|{{{depName}}}-{{{newValue}}}|g' {} +" + "find template -type f -exec sed -i 's|{{{depName}}}@{{{currentDigest}}} # {{{currentValue}}}|{{{depName}}}@{{{newDigest}}} # {{{newValue}}}|g' {} +", + "find template -type f -exec sed -i 's|{{{depName}}}@{{{currentValue}}}|{{{depName}}}@{{{newDigest}}} # {{{newValue}}}|g' {} +" ] } }, { - "matchManagers": [ - "pre-commit" + "matchDepTypes": [ + "github-runner" ], "postUpgradeTasks": { "commands": [ - "find template -type f -name '.pre-commit-config.yaml.jinja' -exec sed -i '/{{{replace \"/\" \"\\/\" depName}}}/{N;s/rev: {{{currentValue}}}/rev: {{{newValue}}}/}' {} +" + "find template -type f -exec sed -i 's|{{{depName}}}-{{{currentValue}}}|{{{depName}}}-{{{newValue}}}|g' {} +" ] } }, { - "matchDepTypes": [ - "action" + "matchManagers": [ + "pre-commit" ], "postUpgradeTasks": { "commands": [ - "find template -type f -exec sed -i 's|{{{depName}}}@{{{currentDigest}}} # {{{currentValue}}}|{{{depName}}}@{{{newDigest}}} # {{{newValue}}}|g' {} +", - "find template -type f -exec sed -i 's|{{{depName}}}@{{{currentValue}}}|{{{depName}}}@{{{newDigest}}} # {{{newValue}}}|g' {} +" + "find template -type f -name '.pre-commit-config.yaml.jinja' -exec sed -i '/{{{replace \"/\" \"\\/\" depName}}}/{N;s/rev: {{{currentValue}}}/rev: {{{newValue}}}/}' {} +" ] } }, diff --git a/template/.renovaterc.json.jinja b/template/.renovaterc.json.jinja index 9084ba0d..52cc62cd 100644 --- a/template/.renovaterc.json.jinja +++ b/template/.renovaterc.json.jinja @@ -103,32 +103,32 @@ [%- if project_name == "Serious Scaffold Python" %] { "matchDepTypes": [ - "github-runner" + "action" ], "postUpgradeTasks": { "commands": [ - "find template -type f -exec sed -i {{ '\'s|{{{depName}}}-{{{currentValue}}}|{{{depName}}}-{{{newValue}}}|g\' {} +' }}" + "find template -type f -exec sed -i {{ '\'s|{{{depName}}}@{{{currentDigest}}} # {{{currentValue}}}|{{{depName}}}@{{{newDigest}}} # {{{newValue}}}|g\' {} +' }}", + "find template -type f -exec sed -i {{ '\'s|{{{depName}}}@{{{currentValue}}}|{{{depName}}}@{{{newDigest}}} # {{{newValue}}}|g\' {} +' }}" ] } }, { - "matchManagers": [ - "pre-commit" + "matchDepTypes": [ + "github-runner" ], "postUpgradeTasks": { "commands": [ - "find template -type f -name '.pre-commit-config.yaml.jinja' -exec sed -i {{ '\'/{{{replace \\"/\\" \\"\\\\/\\" depName}}}/{N;s/rev: {{{currentValue}}}/rev: {{{newValue}}}/}\'' }} {} +" + "find template -type f -exec sed -i {{ '\'s|{{{depName}}}-{{{currentValue}}}|{{{depName}}}-{{{newValue}}}|g\' {} +' }}" ] } }, { - "matchDepTypes": [ - "action" + "matchManagers": [ + "pre-commit" ], "postUpgradeTasks": { "commands": [ - "find template -type f -exec sed -i {{ '\'s|{{{depName}}}@{{{currentDigest}}} # {{{currentValue}}}|{{{depName}}}@{{{newDigest}}} # {{{newValue}}}|g\' {} +' }}", - "find template -type f -exec sed -i {{ '\'s|{{{depName}}}@{{{currentValue}}}|{{{depName}}}@{{{newDigest}}} # {{{newValue}}}|g\' {} +' }}" + "find template -type f -name '.pre-commit-config.yaml.jinja' -exec sed -i {{ '\'/{{{replace \\"/\\" \\"\\\\/\\" depName}}}/{N;s/rev: {{{currentValue}}}/rev: {{{newValue}}}/}\'' }} {} +" ] } },