From 14ff309d5587f316c51c516fd1da39fcc3c190aa Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 7 Oct 2024 18:21:33 +0000 Subject: [PATCH 1/9] Update dependency @typescript-eslint/parser to v8.8.1 --- yarn.lock | 56 +++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/yarn.lock b/yarn.lock index d238eff..ff31909 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2432,14 +2432,14 @@ debug "^4.3.4" "@typescript-eslint/parser@^8.0.0": - version "8.8.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.8.0.tgz#ee4397c70230c4eee030456924c0fba480072f5e" - integrity sha512-uEFUsgR+tl8GmzmLjRqz+VrDv4eoaMqMXW7ruXfgThaAShO9JTciKpEsB+TvnfFfbg5IpujgMXVV36gOJRLtZg== + version "8.8.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.8.1.tgz#5952ba2a83bd52024b872f3fdc8ed2d3636073b8" + integrity sha512-hQUVn2Lij2NAxVFEdvIGxT9gP1tq2yM83m+by3whWFsWC+1y8pxxxHUFE1UqDu2VsGi2i6RLcv4QvouM84U+ow== dependencies: - "@typescript-eslint/scope-manager" "8.8.0" - "@typescript-eslint/types" "8.8.0" - "@typescript-eslint/typescript-estree" "8.8.0" - "@typescript-eslint/visitor-keys" "8.8.0" + "@typescript-eslint/scope-manager" "8.8.1" + "@typescript-eslint/types" "8.8.1" + "@typescript-eslint/typescript-estree" "8.8.1" + "@typescript-eslint/visitor-keys" "8.8.1" debug "^4.3.4" "@typescript-eslint/scope-manager@5.62.0": @@ -2450,13 +2450,13 @@ "@typescript-eslint/types" "5.62.0" "@typescript-eslint/visitor-keys" "5.62.0" -"@typescript-eslint/scope-manager@8.8.0": - version "8.8.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.8.0.tgz#30b23a6ae5708bd7882e40675ef2f1b2beac741f" - integrity sha512-EL8eaGC6gx3jDd8GwEFEV091210U97J0jeEHrAYvIYosmEGet4wJ+g0SYmLu+oRiAwbSA5AVrt6DxLHfdd+bUg== +"@typescript-eslint/scope-manager@8.8.1": + version "8.8.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.8.1.tgz#b4bea1c0785aaebfe3c4ab059edaea1c4977e7ff" + integrity sha512-X4JdU+66Mazev/J0gfXlcC/dV6JI37h+93W9BRYXrSn0hrE64IoWgVkO9MSJgEzoWkxONgaQpICWg8vAN74wlA== dependencies: - "@typescript-eslint/types" "8.8.0" - "@typescript-eslint/visitor-keys" "8.8.0" + "@typescript-eslint/types" "8.8.1" + "@typescript-eslint/visitor-keys" "8.8.1" "@typescript-eslint/type-utils@5.62.0": version "5.62.0" @@ -2473,10 +2473,10 @@ resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz" integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ== -"@typescript-eslint/types@8.8.0": - version "8.8.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.8.0.tgz#08ea5df6c01984d456056434641491fbf7a1bf43" - integrity sha512-QJwc50hRCgBd/k12sTykOJbESe1RrzmX6COk8Y525C9l7oweZ+1lw9JiU56im7Amm8swlz00DRIlxMYLizr2Vw== +"@typescript-eslint/types@8.8.1": + version "8.8.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.8.1.tgz#ebe85e0fa4a8e32a24a56adadf060103bef13bd1" + integrity sha512-WCcTP4SDXzMd23N27u66zTKMuEevH4uzU8C9jf0RO4E04yVHgQgW+r+TeVTNnO1KIfrL8ebgVVYYMMO3+jC55Q== "@typescript-eslint/typescript-estree@5.62.0": version "5.62.0" @@ -2491,13 +2491,13 @@ semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/typescript-estree@8.8.0": - version "8.8.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.8.0.tgz#072eaab97fdb63513fabfe1cf271812affe779e3" - integrity sha512-ZaMJwc/0ckLz5DaAZ+pNLmHv8AMVGtfWxZe/x2JVEkD5LnmhWiQMMcYT7IY7gkdJuzJ9P14fRy28lUrlDSWYdw== +"@typescript-eslint/typescript-estree@8.8.1": + version "8.8.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.8.1.tgz#34649f4e28d32ee49152193bc7dedc0e78e5d1ec" + integrity sha512-A5d1R9p+X+1js4JogdNilDuuq+EHZdsH9MjTVxXOdVFfTJXunKJR/v+fNNyO4TnoOn5HqobzfRlc70NC6HTcdg== dependencies: - "@typescript-eslint/types" "8.8.0" - "@typescript-eslint/visitor-keys" "8.8.0" + "@typescript-eslint/types" "8.8.1" + "@typescript-eslint/visitor-keys" "8.8.1" debug "^4.3.4" fast-glob "^3.3.2" is-glob "^4.0.3" @@ -2527,12 +2527,12 @@ "@typescript-eslint/types" "5.62.0" eslint-visitor-keys "^3.3.0" -"@typescript-eslint/visitor-keys@8.8.0": - version "8.8.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.8.0.tgz#f93965abd38c82a1a1f5574290a50d02daf1cd2e" - integrity sha512-8mq51Lx6Hpmd7HnA2fcHQo3YgfX1qbccxQOgZcb4tvasu//zXRaA1j5ZRFeCw/VRAdFi4mRM9DnZw0Nu0Q2d1g== +"@typescript-eslint/visitor-keys@8.8.1": + version "8.8.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.8.1.tgz#0fb1280f381149fc345dfde29f7542ff4e587fc5" + integrity sha512-0/TdC3aeRAsW7MDvYRwEc1Uwm0TIBfzjPFgg60UU2Haj5qsCs9cc3zNgY71edqE3LbWfF/WoZQd3lJoDXFQpag== dependencies: - "@typescript-eslint/types" "8.8.0" + "@typescript-eslint/types" "8.8.1" eslint-visitor-keys "^3.4.3" "@ungap/structured-clone@^1.2.0": From 23d5040cac2d902104948e4482c0b66c997bd18d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 7 Oct 2024 22:19:11 +0000 Subject: [PATCH 2/9] Update dependency @types/node to v22.7.5 --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index ff31909..81e777d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2249,9 +2249,9 @@ integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== "@types/node@*", "@types/node@^22.0.0": - version "22.7.4" - resolved "https://registry.yarnpkg.com/@types/node/-/node-22.7.4.tgz#e35d6f48dca3255ce44256ddc05dee1c23353fcc" - integrity sha512-y+NPi1rFzDs1NdQHHToqeiX2TIS79SWEAw9GYhkkx8bD0ChpfqC+n2j5OXOCpzfojBEBt6DnEnnG9MY0zk1XLg== + version "22.7.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.7.5.tgz#cfde981727a7ab3611a481510b473ae54442b92b" + integrity sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ== dependencies: undici-types "~6.19.2" From fa663a63e0f4a7794b4609ec6ae172427dd29f54 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 8 Oct 2024 22:18:52 +0000 Subject: [PATCH 3/9] Update dependency typescript to v5.6.3 --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 81e777d..01dab1c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9858,9 +9858,9 @@ typedarray-to-buffer@^3.1.5: is-typedarray "^1.0.0" typescript@^5.2.2: - version "5.6.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.2.tgz#d1de67b6bef77c41823f822df8f0b3bcff60a5a0" - integrity sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw== + version "5.6.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.3.tgz#5f3449e31c9d94febb17de03cc081dd56d81db5b" + integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw== unbox-primitive@^1.0.2: version "1.0.2" From 1a832a766703c8efb391e871cfa4b60f4340f8a7 Mon Sep 17 00:00:00 2001 From: Tom Neuber Date: Wed, 9 Oct 2024 01:18:17 +0200 Subject: [PATCH 4/9] .woodpecker/.deploy.yaml: add a random message to PR --- .woodpecker/.deploy.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.woodpecker/.deploy.yaml b/.woodpecker/.deploy.yaml index 5f19257..b544e7f 100644 --- a/.woodpecker/.deploy.yaml +++ b/.woodpecker/.deploy.yaml @@ -48,10 +48,18 @@ steps: - branch: exclude: master event: push +- name: generate random pull request message + image: git.ar21.de/tom/push-message-randomizer:latest + pull: true + when: + - event: push - name: create pull request (prod) image: johnwalkerx/gitea-pull-request-create-plugin:latest pull: true + commands: + - PLUGIN_PR_BODY_MESSAGE="$(cat message.txt)" settings: + pr_body_message: "" gitea_address: https://git.ar21.de gitea_token: from_secret: FORGEJO_API @@ -63,6 +71,8 @@ steps: pr_body: | ### ℹ Dashboard image update + $${PLUGIN_PR_BODY_MESSAGE} + ### Configuration 📅 **Schedule**: Branch creation - At any time, Automerge - At any time. @@ -79,7 +89,10 @@ steps: - name: create pull request (staging) image: johnwalkerx/gitea-pull-request-create-plugin:latest pull: true + commands: + - PLUGIN_PR_BODY_MESSAGE="$(cat message.txt)" settings: + pr_body_message: "" gitea_address: https://git.ar21.de gitea_token: from_secret: FORGEJO_API @@ -91,6 +104,8 @@ steps: pr_body: | ### ℹ Dashboard image update + $${PLUGIN_PR_BODY_MESSAGE} + ### Configuration 📅 **Schedule**: Branch creation - At any time, Automerge - At any time. From 12fcfbe37afd6951f115df2af9af282d5d4dd6cc Mon Sep 17 00:00:00 2001 From: Tom Neuber Date: Wed, 9 Oct 2024 02:04:11 +0200 Subject: [PATCH 5/9] woodpecker: we need to remove "settings" and switch to "environment" because of this very important feature --- .woodpecker/.deploy.yaml | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/.woodpecker/.deploy.yaml b/.woodpecker/.deploy.yaml index b544e7f..7066e57 100644 --- a/.woodpecker/.deploy.yaml +++ b/.woodpecker/.deploy.yaml @@ -56,8 +56,8 @@ steps: - name: create pull request (prod) image: johnwalkerx/gitea-pull-request-create-plugin:latest pull: true - commands: - - PLUGIN_PR_BODY_MESSAGE="$(cat message.txt)" + #commands: + # - PLUGIN_PR_BODY_MESSAGE="$(cat message.txt)" settings: pr_body_message: "" gitea_address: https://git.ar21.de @@ -91,17 +91,18 @@ steps: pull: true commands: - PLUGIN_PR_BODY_MESSAGE="$(cat message.txt)" - settings: - pr_body_message: "" - gitea_address: https://git.ar21.de - gitea_token: + - /gitea-pull-request-create-plugin + environment: + PLUGIN_PR_BODY_MESSAGE: "" + PLUGIN_GITEA_ADDRESS: https://git.ar21.de + PLUGIN_GITEA_TOKEN: from_secret: FORGEJO_API - owner: ${CI_REPO_OWNER} - repo: core-deployments - branch: "${CI_PIPELINE_NUMBER}_dashboard_staging" - base_branch: main - pr_title: "DASHBOARD STAGING: update image tag to ${CI_PIPELINE_NUMBER}" - pr_body: | + PLUGIN_OWNER: ${CI_REPO_OWNER} + PLUGIN_REPO: core-deployments + PLUGIN_BRANCH: "${CI_PIPELINE_NUMBER}_dashboard_staging" + PLUGIN_BASE_BRANCH: main + PLUGIN_PR_TITLE: "DASHBOARD STAGING: update image tag to ${CI_PIPELINE_NUMBER}" + PLUGIN_PR_BODY: | ### ℹ Dashboard image update $${PLUGIN_PR_BODY_MESSAGE} @@ -111,11 +112,11 @@ steps: 📅 **Schedule**: Branch creation - At any time, Automerge - At any time. 🚦 **Automerge**: Enabled. - skip_on_missing_branch: true - close_pr_if_empty: true - delete_branch_if_pr_empty: true - merge_when_checks_succeed: true - delete_branch_after_merge: true + PLUGIN_SKIP_ON_MISSING_BRANCH: true + PLUGIN_CLOSE_PR_IF_EMPTY: true + PLUGIN_DELETE_BRANCH_IF_PR_EMPTY: true + PLUGIN_MERGE_WHEN_CHECKS_SUCCEED: true + PLUGIN_DELETE_BRANCH_AFTER_MERGE: true when: - branch: exclude: master From 4a4d5d9d55540e58e600c22da9299c69df01bcee Mon Sep 17 00:00:00 2001 From: Tom Neuber Date: Wed, 9 Oct 2024 02:10:23 +0200 Subject: [PATCH 6/9] test --- .woodpecker/.deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.woodpecker/.deploy.yaml b/.woodpecker/.deploy.yaml index 7066e57..fa6268e 100644 --- a/.woodpecker/.deploy.yaml +++ b/.woodpecker/.deploy.yaml @@ -90,6 +90,7 @@ steps: image: johnwalkerx/gitea-pull-request-create-plugin:latest pull: true commands: + - ls -l - PLUGIN_PR_BODY_MESSAGE="$(cat message.txt)" - /gitea-pull-request-create-plugin environment: From 41ff3a3e9814ed8279e0919f12e9fbb7c5e9ec78 Mon Sep 17 00:00:00 2001 From: Tom Neuber Date: Wed, 9 Oct 2024 02:43:02 +0200 Subject: [PATCH 7/9] test 2 --- .woodpecker/.deploy.yaml | 47 +++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/.woodpecker/.deploy.yaml b/.woodpecker/.deploy.yaml index fa6268e..bc7cce6 100644 --- a/.woodpecker/.deploy.yaml +++ b/.woodpecker/.deploy.yaml @@ -1,4 +1,7 @@ skip_clone: true +variables: + - &test + PR_BODY_MESSAGE: lol steps: - name: bump tag in deployment-repo (prod) image: git.ar21.de/aaron/kustomize-ci @@ -51,6 +54,13 @@ steps: - name: generate random pull request message image: git.ar21.de/tom/push-message-randomizer:latest pull: true + environment: + <<: *test + commands: + - /entrypoint.sh + - echo "${PR_BODY_MESSAGE}" + - PR_BODY_MESSAGE="$(cat message.txt)" + - echo "${PR_BODY_MESSAGE}" when: - event: push - name: create pull request (prod) @@ -89,35 +99,32 @@ steps: - name: create pull request (staging) image: johnwalkerx/gitea-pull-request-create-plugin:latest pull: true - commands: - - ls -l - - PLUGIN_PR_BODY_MESSAGE="$(cat message.txt)" - - /gitea-pull-request-create-plugin - environment: - PLUGIN_PR_BODY_MESSAGE: "" - PLUGIN_GITEA_ADDRESS: https://git.ar21.de - PLUGIN_GITEA_TOKEN: + settings: + <<: *test + gitea_address: https://git.ar21.de + gitea_token: from_secret: FORGEJO_API - PLUGIN_OWNER: ${CI_REPO_OWNER} - PLUGIN_REPO: core-deployments - PLUGIN_BRANCH: "${CI_PIPELINE_NUMBER}_dashboard_staging" - PLUGIN_BASE_BRANCH: main - PLUGIN_PR_TITLE: "DASHBOARD STAGING: update image tag to ${CI_PIPELINE_NUMBER}" - PLUGIN_PR_BODY: | + owner: ${CI_REPO_OWNER} + repo: core-deployments + branch: "${CI_PIPELINE_NUMBER}_dashboard_staging" + base_branch: main + pr_title: "DASHBOARD STAGING: update image tag to ${CI_PIPELINE_NUMBER}" + pr_body: | ### ℹ Dashboard image update - $${PLUGIN_PR_BODY_MESSAGE} + ${PLUGIN_PR_BODY_MESSAGE} + ${PR_BODY_MESSAGE} ### Configuration 📅 **Schedule**: Branch creation - At any time, Automerge - At any time. 🚦 **Automerge**: Enabled. - PLUGIN_SKIP_ON_MISSING_BRANCH: true - PLUGIN_CLOSE_PR_IF_EMPTY: true - PLUGIN_DELETE_BRANCH_IF_PR_EMPTY: true - PLUGIN_MERGE_WHEN_CHECKS_SUCCEED: true - PLUGIN_DELETE_BRANCH_AFTER_MERGE: true + skip_on_missing_branch: true + close_pr_if_empty: true + delete_branch_if_pr_empty: true + merge_when_checks_succeed: true + delete_branch_after_merge: true when: - branch: exclude: master From c8834a863243d849d8be0ae3afea2a2bc909e038 Mon Sep 17 00:00:00 2001 From: Tom Neuber Date: Wed, 9 Oct 2024 13:34:12 +0200 Subject: [PATCH 8/9] replace create-pr image with own randomizer image --- .woodpecker/.deploy.yaml | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/.woodpecker/.deploy.yaml b/.woodpecker/.deploy.yaml index bc7cce6..d4327c3 100644 --- a/.woodpecker/.deploy.yaml +++ b/.woodpecker/.deploy.yaml @@ -1,7 +1,4 @@ skip_clone: true -variables: - - &test - PR_BODY_MESSAGE: lol steps: - name: bump tag in deployment-repo (prod) image: git.ar21.de/aaron/kustomize-ci @@ -51,25 +48,10 @@ steps: - branch: exclude: master event: push -- name: generate random pull request message +- name: create pull request (prod) image: git.ar21.de/tom/push-message-randomizer:latest pull: true - environment: - <<: *test - commands: - - /entrypoint.sh - - echo "${PR_BODY_MESSAGE}" - - PR_BODY_MESSAGE="$(cat message.txt)" - - echo "${PR_BODY_MESSAGE}" - when: - - event: push -- name: create pull request (prod) - image: johnwalkerx/gitea-pull-request-create-plugin:latest - pull: true - #commands: - # - PLUGIN_PR_BODY_MESSAGE="$(cat message.txt)" settings: - pr_body_message: "" gitea_address: https://git.ar21.de gitea_token: from_secret: FORGEJO_API @@ -81,7 +63,7 @@ steps: pr_body: | ### ℹ Dashboard image update - $${PLUGIN_PR_BODY_MESSAGE} + {- random-pr-message -} ### Configuration @@ -97,10 +79,9 @@ steps: - branch: master event: push - name: create pull request (staging) - image: johnwalkerx/gitea-pull-request-create-plugin:latest + image: git.ar21.de/tom/push-message-randomizer:latest pull: true settings: - <<: *test gitea_address: https://git.ar21.de gitea_token: from_secret: FORGEJO_API @@ -112,8 +93,7 @@ steps: pr_body: | ### ℹ Dashboard image update - ${PLUGIN_PR_BODY_MESSAGE} - ${PR_BODY_MESSAGE} + {- random-pr-message -} ### Configuration From 8ae1e00d455a897159ad2711e23bdb2e8267bd3a Mon Sep 17 00:00:00 2001 From: Tom Neuber Date: Wed, 9 Oct 2024 01:18:17 +0200 Subject: [PATCH 9/9] .woodpecker/.deploy.yaml: add a random message to PR --- .woodpecker/.deploy.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.woodpecker/.deploy.yaml b/.woodpecker/.deploy.yaml index 5f19257..d4327c3 100644 --- a/.woodpecker/.deploy.yaml +++ b/.woodpecker/.deploy.yaml @@ -49,7 +49,7 @@ steps: exclude: master event: push - name: create pull request (prod) - image: johnwalkerx/gitea-pull-request-create-plugin:latest + image: git.ar21.de/tom/push-message-randomizer:latest pull: true settings: gitea_address: https://git.ar21.de @@ -63,6 +63,8 @@ steps: pr_body: | ### ℹ Dashboard image update + {- random-pr-message -} + ### Configuration 📅 **Schedule**: Branch creation - At any time, Automerge - At any time. @@ -77,7 +79,7 @@ steps: - branch: master event: push - name: create pull request (staging) - image: johnwalkerx/gitea-pull-request-create-plugin:latest + image: git.ar21.de/tom/push-message-randomizer:latest pull: true settings: gitea_address: https://git.ar21.de @@ -91,6 +93,8 @@ steps: pr_body: | ### ℹ Dashboard image update + {- random-pr-message -} + ### Configuration 📅 **Schedule**: Branch creation - At any time, Automerge - At any time.