Skip to content

Commit 9fc428f

Browse files
olblakolblak
authored
Merge branch 'main' into dependabot/npm_and_yarn/yaml-1.10.3
2 parents 2b77758 + 915535f commit 9fc428f

File tree

7 files changed

+166
-45
lines changed

7 files changed

+166
-45
lines changed

‎.github/workflows/typos.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ jobs:
1111
- name: Checkout Actions Repository
1212
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
1313
- name: Check spelling of file.txt
14-
uses: crate-ci/typos@v1.42.0
14+
uses: crate-ci/typos@631208b7aac2daa8b707f55e7331f9112b0e062d # v1.44.0

‎.github/workflows/updatecli.yaml‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,34 @@
1-
name: updatecli
1+
---
2+
name: Updatecli
3+
24
on:
35
workflow_dispatch:
46
schedule:
5-
# * is a special character in YAML so you have to quote this string
6-
# Run every hour
7-
- cron: '0/5 * * * *'
7+
# Run at 12:00 every 14 days
8+
- cron: "0 12 */14 * *"
9+
10+
permissions: {}
11+
812
jobs:
913
updatecli:
1014
runs-on: ubuntu-latest
1115
steps:
1216
- name: "Checkout"
13-
uses: "actions/checkout@v3"
17+
uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2
18+
with:
19+
persist-credentials: false
1420

1521
- name: "Setup updatecli"
16-
uses: "updatecli/updatecli-action@v2"
17-
18-
- uses: tibdex/github-app-token@v1.6
19-
id: generate_token
20-
if: github.ref == 'refs/heads/main'
22+
uses: "updatecli/updatecli-action@2cc8e6d8e356d76b0280cdd03766c36596a0614e" # v3.0.0
2123
with:
22-
app_id: ${{ secrets.UPDATECLIBOT_APP_ID }}
23-
private_key: ${{ secrets.UPDATECLIBOT_APP_PRIVKEY }}
24+
version: "v0.115.0"
2425

25-
- name: "Login Udash"
26-
if: github.ref == 'refs/heads/main'
27-
run: "updatecli udash login --experimental --api-url $UPDATECLI_UDASH_API_URL --oauth-access-token $UPDATECLI_UDASH_ACCESS_TOKEN $UPDATECLI_UDASH_URL"
26+
- name: "Run updatecli"
27+
run: updatecli compose apply --clean-git-branches=true --experimental
2828
env:
29+
UPDATECLI_GITHUB_APP_CLIENT_ID: ${{ secrets.UPDATECLIBOT_APP_ID }}
30+
UPDATECLI_GITHUB_APP_PRIVATE_KEY: ${{ secrets.UPDATECLIBOT_APP_PRIVKEY }}
31+
UPDATECLI_GITHUB_APP_INSTALLATION_ID: ${{ secrets.UPDATECLIBOT_APP_INSTALLATION_ID }}
2932
UPDATECLI_UDASH_API_URL: ${{ secrets.UPDATECLI_UDASH_API_URL }}
3033
UPDATECLI_UDASH_ACCESS_TOKEN: ${{ secrets.UPDATECLI_UDASH_ACCESS_TOKEN }}
3134
UPDATECLI_UDASH_URL: ${{ secrets.UPDATECLI_UDASH_URL }}
32-
33-
- name: "Run updatecli"
34-
run: "updatecli compose apply --experimental"
35-
env:
36-
GITHUB_ACTOR: ${{ secrets.UPDATECLI_BOT_GITHUB_ACTOR }}
37-
GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}

‎.github/workflows/updatecli_release.yaml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
name: Updatecli - Release
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
# Run daily at 03:00
7+
- cron: "0 3 * * *"
8+
repository_dispatch:
9+
types:
10+
- "updatecli-release"
11+
permissions: {}
12+
jobs:
13+
updatecli:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: "Checkout"
17+
uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2
18+
with:
19+
persist-credentials: false
20+
- name: "Setup updatecli"
21+
uses: "updatecli/updatecli-action@2cc8e6d8e356d76b0280cdd03766c36596a0614e" # v3.0.0
22+
with:
23+
version: "v0.115.0"
24+
- name: "Run updatecli only on Updatecli release event"
25+
run: updatecli compose apply --clean-git-branches=true --labels="release:updatecli" --experimental
26+
env:
27+
UPDATECLI_GITHUB_APP_CLIENT_ID: ${{ secrets.UPDATECLIBOT_APP_ID }}
28+
UPDATECLI_GITHUB_APP_PRIVATE_KEY: ${{ secrets.UPDATECLIBOT_APP_PRIVKEY }}
29+
UPDATECLI_GITHUB_APP_INSTALLATION_ID: ${{ secrets.UPDATECLIBOT_APP_INSTALLATION_ID }}
30+
UPDATECLI_UDASH_API_URL: ${{ secrets.UPDATECLI_UDASH_API_URL }}
31+
UPDATECLI_UDASH_ACCESS_TOKEN: ${{ secrets.UPDATECLI_UDASH_ACCESS_TOKEN }}
32+
UPDATECLI_UDASH_URL: ${{ secrets.UPDATECLI_UDASH_URL }}

‎.github/workflows/updatecli_test.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
name: Updatecli Test
3+
on:
4+
pull_request:
5+
permissions:
6+
contents: read
7+
jobs:
8+
updatecli:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: "Checkout"
12+
uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2
13+
with:
14+
persist-credentials: false
15+
- name: "Setup updatecli"
16+
uses: "updatecli/updatecli-action@2cc8e6d8e356d76b0280cdd03766c36596a0614e" # v3.0.0
17+
with:
18+
version: "v0.115.0"
19+
- name: "Test updatecli in dry-run mode"
20+
run: "updatecli compose diff"
21+
env:
22+
# This step is executed in untrusted context. We use a GitHub token with minimal permissions.
23+
UPDATECLI_GITHUB_USERNAME: ${{ github.actor }}
24+
UPDATECLI_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/updatecli_update.yaml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
---
2+
name: Updatecli - Update
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
# Run daily at 03:00
7+
- cron: "0 3 * * *"
8+
push:
9+
branches:
10+
- main
11+
permissions: {}
12+
jobs:
13+
updatecli:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: "Checkout"
17+
uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2
18+
with:
19+
persist-credentials: false
20+
- name: "Setup updatecli"
21+
uses: "updatecli/updatecli-action@2cc8e6d8e356d76b0280cdd03766c36596a0614e" # v3.0.0
22+
with:
23+
version: "v0.115.0"
24+
- name: "Run updatecli only on monitored pipelines"
25+
run: updatecli compose apply --clean-git-branches=true --labels="monitor:active" --experimental
26+
env:
27+
UPDATECLI_GITHUB_APP_CLIENT_ID: ${{ secrets.UPDATECLIBOT_APP_ID }}
28+
UPDATECLI_GITHUB_APP_PRIVATE_KEY: ${{ secrets.UPDATECLIBOT_APP_PRIVKEY }}
29+
UPDATECLI_GITHUB_APP_INSTALLATION_ID: ${{ secrets.UPDATECLIBOT_APP_INSTALLATION_ID }}
30+
UPDATECLI_UDASH_API_URL: ${{ secrets.UPDATECLI_UDASH_API_URL }}
31+
UPDATECLI_UDASH_ACCESS_TOKEN: ${{ secrets.UPDATECLI_UDASH_ACCESS_TOKEN }}
32+
UPDATECLI_UDASH_URL: ${{ secrets.UPDATECLI_UDASH_URL }}
33+
34+
- name: "Run updatecli only on existing pipelines"
35+
run: updatecli compose apply --clean-git-branches=true --existing-only=true --experimental
36+
env:
37+
UPDATECLI_GITHUB_APP_CLIENT_ID: ${{ secrets.UPDATECLIBOT_APP_ID }}
38+
UPDATECLI_GITHUB_APP_PRIVATE_KEY: ${{ secrets.UPDATECLIBOT_APP_PRIVKEY }}
39+
UPDATECLI_GITHUB_APP_INSTALLATION_ID: ${{ secrets.UPDATECLIBOT_APP_INSTALLATION_ID }}
40+
UPDATECLI_UDASH_API_URL: ${{ secrets.UPDATECLI_UDASH_API_URL }}
41+
UPDATECLI_UDASH_ACCESS_TOKEN: ${{ secrets.UPDATECLI_UDASH_ACCESS_TOKEN }}
42+
UPDATECLI_UDASH_URL: ${{ secrets.UPDATECLI_UDASH_URL }}

‎package-lock.json‎

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎updatecli-compose.yaml‎

Lines changed: 40 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,45 @@
1-
policies:
2-
- name: Local Updatecli Website Policies
3-
config:
4-
- updatecli/updatecli.d/
5-
values:
6-
- updatecli/values.d/scm.yaml
1+
name: Default policy
72

8-
- name: NPM autodiscovery
9-
policy: ghcr.io/updatecli/policies/npm/autodiscovery:0.9.0@sha256:bfb7aaa719c26db1e13095fec27c143cf2c99b64b577d200a0bb658b724d37ae
10-
values:
11-
- updatecli/values.d/scm.yaml
12-
- updatecli/values.d/npm.yaml
3+
valuesinline:
4+
scm:
5+
enabled: true
6+
user: updatecli-bot
7+
email: updatecli-bot@updatecli.io
8+
owner: updatecli
9+
repository: udash-front
10+
username: "updatecli-bot"
11+
branch: main
12+
13+
policies:
1314
- name: Update Updatecli policies
14-
policy: ghcr.io/updatecli/policies/updatecli/autodiscovery:0.5.0@sha256:947817644fb89e27f7b7121b822328c2d47364c7a3a08241e4d2ac1a5897020c
15-
values:
16-
- updatecli/values.d/scm.yaml
15+
policy: ghcr.io/updatecli/policies/updatecli/autodiscovery:0.8.1@sha256:f8edda1a6cbf0d7274e2b847ede29fc4dc70dd5302ccb8575ae21b069cc0d8a0
16+
valuesinline:
17+
pipeline:
18+
labels:
19+
ecosystem: "updatecli"
20+
monitor: active
21+
22+
- name: Handle Updatecli version in GitHub action
23+
policy: ghcr.io/updatecli/policies/updatecli/githubaction:0.8.1@sha256:48872bbf1a09cfff32ff5ffa07086c20b40d6888c19c36048b18f84bbdad37fe
24+
valuesinline:
25+
pipeline:
26+
labels:
27+
ecosystem: "updatecli"
28+
monitor: active
1729

30+
- name: NPM autodiscovery
31+
policy: ghcr.io/updatecli/policies/npm/autodiscovery:0.12.1@sha256:ab02848169d584d7510ab974ec4a27309d9737068b1d888df6a8388a3dad26fc
32+
valuesinline:
33+
automerge: true
34+
groupby: individual
35+
spec:
36+
ignoreversionconstraints: true
1837

38+
- name: Handle GitHub action version update
39+
policy: ghcr.io/updatecli/policies/autodiscovery/githubaction:0.4.1@sha256:869b676074f9fee7edd5d488140a12c3b09a5f8a175f12f26ea85a4f8bd0a9d1
1940

41+
- name: Handle Nodejs version in githubaction
42+
policy: ghcr.io/updatecli/policies/nodejs/githubaction:0.11.1@sha256:812c245adc1f20767ca912baf3087022c78e8153a3f27d43729dd8931864f8e3
43+
valuesinline:
44+
versionpattern: "~24"
45+
automerge: false

0 commit comments

Comments
 (0)