Skip to content

Commit d1a3708

Browse files
olblakolblak
authored
Merge branch 'master' into dependabot/npm_and_yarn/minimatch-3.1.5
2 parents ae8f7d3 + c107c15 commit d1a3708

13 files changed

Lines changed: 47 additions & 40 deletions

‎.github/workflows/updatecli.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
uses: "actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3" # v6.0.0
1515

1616
- name: "Setup updatecli"
17-
uses: "updatecli/updatecli-action@5ca36367fadc6ad94d590984fd9c696e783ec635" # v2.96.0
17+
uses: "updatecli/updatecli-action@v3.0.0"
1818
with:
1919
version: "v0.115.0"
2020

‎.github/workflows/updatecli_release.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
uses: "actions/checkout@v4"
1818

1919
- name: "Install Updatecli"
20-
uses: "updatecli/updatecli-action@v2.96.0"
20+
uses: "updatecli/updatecli-action@v3.0.0"
2121
with:
2222
version: "v0.115.0"
2323

@@ -27,7 +27,7 @@ jobs:
2727
uses: "updatecli/releasepost-action@v0.5.0"
2828

2929
- name: "Run updatecli only on release pipelines"
30-
run: updatecli compose apply --clean-git-branches=true --labels="event:release" --experimental
30+
run: updatecli compose apply --clean-git-branches=true --labels="release:updatecli" --experimental
3131
env:
3232
UPDATECLI_GITHUB_APP_CLIENT_ID: ${{ secrets.UPDATECLIBOT_APP_ID }}
3333
UPDATECLI_GITHUB_APP_PRIVATE_KEY: ${{ secrets.UPDATECLIBOT_APP_PRIVKEY }}

‎.github/workflows/updatecli_test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
uses: "actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3" # v6.0.0
1515

1616
- name: "Setup updatecli"
17-
uses: "updatecli/updatecli-action@5ca36367fadc6ad94d590984fd9c696e783ec635" # v2.96.0
17+
uses: "updatecli/updatecli-action@v3.0.0"
1818
with:
1919
version: "v0.115.0"
2020

‎.github/workflows/updatecli_update.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ jobs:
1313
uses: "actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3" # v6.0.0
1414

1515
- name: "Setup updatecli"
16-
uses: "updatecli/updatecli-action@5ca36367fadc6ad94d590984fd9c696e783ec635" # v2.96.0
16+
uses: "updatecli/updatecli-action@v3.0.0"
1717
with:
1818
version: "v0.115.0"
1919

2020
- name: "Run updatecli only on monitored pipelines"
21-
run: updatecli compose apply --clean-git-branches=true --labels="monitoring:enabled" --experimental
21+
run: updatecli compose apply --clean-git-branches=true --labels="monitor:active" --experimental
2222
env:
2323
UPDATECLI_GITHUB_APP_CLIENT_ID: ${{ secrets.UPDATECLIBOT_APP_ID }}
2424
UPDATECLI_GITHUB_APP_PRIVATE_KEY: ${{ secrets.UPDATECLIBOT_APP_PRIVKEY }}

‎netlify.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[build.environment]
66
HUGO_VERSION = "0.159.1"
77
NODE_VERSION = "20.20.0"
8-
NPM_VERSION = "11.11.1"
8+
NPM_VERSION = "11.12.1"
99

1010
[context.production]
1111
command = "npm run build"

‎updatecli-compose.yaml‎

Lines changed: 34 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,42 +4,65 @@ policies:
44
- updatecli/updatecli.d/
55
values:
66
- updatecli/values.d/scm.yaml
7+
78
- name: Handle Nodejs version in githubaction
89
policy: ghcr.io/updatecli/policies/nodejs/githubaction:0.11.1@sha256:812c245adc1f20767ca912baf3087022c78e8153a3f27d43729dd8931864f8e3
910
values:
1011
- updatecli/values.d/scm.yaml
11-
- updatecli/values.d/nodejs.yaml
12+
valuesinline:
13+
versionpattern: "~24"
14+
automerge: true
15+
1216
- name: Handle Nodejs version in Netlify
1317
policy: ghcr.io/updatecli/policies/nodejs/netlify:0.10.1@sha256:3bc908b4bfc7c44cb4a1ff9c1cad0c61c16f37b9c8e45b50bd632eb05f54521f
1418
values:
1519
- updatecli/values.d/scm.yaml
16-
- updatecli/values.d/nodejs.yaml
17-
- name: Update Updatecli policies
18-
policy: ghcr.io/updatecli/policies/updatecli/autodiscovery:0.8.1@sha256:f8edda1a6cbf0d7274e2b847ede29fc4dc70dd5302ccb8575ae21b069cc0d8a0
19-
values:
20-
- updatecli/values.d/scm.yaml
21-
- updatecli/values.d/compose.yaml
20+
valuesinline:
21+
versionpattern: "~24"
22+
automerge: true
23+
2224
- name: Handle HUGO version in netlify
2325
policy: ghcr.io/updatecli/policies/hugo/netlify:0.10.1@sha256:1f8e3c699605590da3f48ace142f46e10c21bbabbcf26864dcc7ad141dc359ab
2426
values:
2527
- updatecli/values.d/scm.yaml
26-
- updatecli/values.d/hugo.yaml
28+
valuesinline:
29+
automerge: true
30+
2731
- name: Handle HUGO version in GitHub action
2832
policy: ghcr.io/updatecli/policies/hugo/githubaction:0.11.1@sha256:44ced9f1f19b601502194b9c4d3400efb8cd54ea7ab5008b96902ad8ec931fee
2933
values:
3034
- updatecli/values.d/scm.yaml
31-
- updatecli/values.d/hugo.yaml
35+
valuesinline:
36+
automerge: true
37+
3238
- name: Handle NPM version in netlify
3339
policy: ghcr.io/updatecli/policies/npm/netlify:0.11.1@sha256:8fda888dd1e0ec3a4f855817529ece27472bbb77ab59f15dd2ee593df128e284
3440
values:
3541
- updatecli/values.d/scm.yaml
36-
- updatecli/values.d/npm.yaml
42+
valuesinline:
43+
automerge: true
44+
3745
- name: NPM autodiscovery
3846
policy: ghcr.io/updatecli/policies/npm/autodiscovery:0.12.1@sha256:ab02848169d584d7510ab974ec4a27309d9737068b1d888df6a8388a3dad26fc
3947
values:
4048
- updatecli/values.d/scm.yaml
41-
- updatecli/values.d/npm.yaml
49+
valuesinline:
50+
automerge: true
51+
groupby: individual
52+
spec:
53+
ignoreversionconstraints: true
54+
4255
- name: Handle Updatecli version in GitHub action
4356
policy: ghcr.io/updatecli/policies/updatecli/githubaction:0.8.1@sha256:48872bbf1a09cfff32ff5ffa07086c20b40d6888c19c36048b18f84bbdad37fe
4457
values:
4558
- updatecli/values.d/scm.yaml
59+
60+
- name: Update Updatecli policies
61+
policy: ghcr.io/updatecli/policies/updatecli/autodiscovery:0.7.0@sha256:6890c4b4093a80063f518101881098fab8211c986481641faaf797a9ad5a31c3
62+
values:
63+
- updatecli/values.d/scm.yaml
64+
valuesinline:
65+
spec:
66+
files:
67+
- "updatecli-compose.yaml"
68+
- "updatecli-compose-release.yaml"

‎updatecli/updatecli.d/docs.yaml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ name: "docs: update Updatecli cli documentation"
22
pipelineid: cli_docs
33

44
labels:
5-
event: release
6-
monitoring: enable
5+
release: updatecli
6+
monitor: active
77

88
actions:
99
default:
@@ -39,5 +39,3 @@ targets:
3939
environments:
4040
- name: PATH
4141
scmid: default
42-
43-
version: "0.109.0"

‎updatecli/updatecli.d/installation.yaml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ name: "docs: update Updatecli version throughout the documentation"
22
pipelineid: updatecli/version
33

44
labels:
5-
event: release
6-
monitoring: enable
5+
release: updatecli
6+
monitor: active
77

88
actions:
99
default:
@@ -48,5 +48,3 @@ targets:
4848
replacepattern: https://github.com/updatecli/updatecli/releases/download/{{ source "updatecli" }}/
4949
scmid: default
5050
sourceid: updatecli
51-
52-
version: 0.109.0

‎updatecli/updatecli.d/jsonschema.yaml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ pipelineid: jsonschema
22
name: "docs: update Updatecli jsonschema"
33

44
labels:
5-
event: release
6-
monitoring: enable
5+
release: updatecli
6+
monitor: active
77

88
actions:
99
default:
@@ -50,5 +50,3 @@ targets:
5050
environments:
5151
- name: PATH
5252
scmid: default
53-
54-
version: 0.109.0

‎updatecli/values.d/compose.yaml‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)