Skip to content

Commit 05f1c77

Browse files
simonpasquiersimonpasquier
authored
Merge pull request #100 from simonpasquier/bump-actions
chore: bump deprecated actions
2 parents 7b9015f + c08116c commit 05f1c77

13 files changed

+24
-36
lines changed

‎.github/workflows/actions-ci-check.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,7 @@ jobs:
66
steps:
77
- uses: actions/checkout@v4
88
- uses: reviewdog/action-actionlint@v1
9+
with:
10+
fail_on_error: "true"
11+
# Disable shellcheck tool because it's too nit-picky with inlined Bash commands.
12+
actionlint_flags: '-shellcheck=""'

‎.github/workflows/cmo-make-targets.yaml‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ name: cluster-monitoring-operator make targets
22
on:
33
workflow_call:
44
inputs:
5-
go-version:
6-
description: go version
7-
required: true
8-
type: string
95
pr-title:
106
description: Pull request title.
117
required: true
@@ -41,40 +37,40 @@ jobs:
4137
execute-make-targets:
4238
runs-on: ubuntu-latest
4339
steps:
44-
- uses: actions/checkout@v2
40+
- uses: actions/checkout@v4
4541
with:
4642
repository: openshift/cluster-monitoring-operator
4743
ref: master
48-
- uses: actions/setup-go@v2
44+
- uses: actions/setup-go@v5
4945
with:
50-
go-version: ${{ inputs.go-version }}
46+
go-version-file: go.mod
5147
- name: Execute make targets - ${{ inputs.make-targets }}
5248
run: make ${{ inputs.make-targets }}
5349
- name: Ignore if change is only in jsonnetfile.lock.json
5450
run: |
5551
# Reset jsonnetfile.lock.json if no dependencies were updated
56-
changedFiles=$(git diff --name-only | grep -v 'jsonnetfile.lock.json' | wc -l)
52+
changedFiles=$(git diff --name-only | grep -cv 'jsonnetfile.lock.json')
5753
if [[ "$changedFiles" -eq 0 ]]; then
5854
git checkout -- jsonnet/jsonnetfile.lock.json;
5955
fi
6056
- name: get pr creation app token
6157
id: pr
62-
uses: getsentry/action-github-app-token@v1
58+
uses: getsentry/action-github-app-token@v3
6359
with:
6460
app_id: ${{ secrets.pr-app-id }}
6561
private_key: ${{ secrets.pr-app-private-key }}
6662
scope: openshift
6763
- name: get cloner app token
6864
id: cloner
69-
uses: getsentry/action-github-app-token@v1
65+
uses: getsentry/action-github-app-token@v3
7066
with:
7167
app_id: ${{ secrets.cloner-app-id }}
7268
private_key: ${{ secrets.cloner-app-private-key }}
7369
scope: rhobs
7470
- name: Find branch name
7571
id: branch
7672
run: |
77-
echo "sandbox=$(echo ${{ inputs.make-targets }} | sed 's/ /-/g')" >> $GITHUB_OUTPUT
73+
echo sandbox="$(echo ${{ inputs.make-targets }} | sed 's/ /-/g')" >> "$GITHUB_OUTPUT"
7874
- name: Create Pull Request
7975
id: create-pr
8076
uses: rhobs/create-pull-request@v3
@@ -94,9 +90,9 @@ jobs:
9490
id: slack-message
9591
run: |
9692
if [ "${{ steps.create-pr.outputs.pull-request-url }}" == "" ]; then
97-
echo "message=No changes detected." >> $GITHUB_OUTPUT
93+
echo "message=No changes detected." >> "$GITHUB_OUTPUT"
9894
else
99-
echo "message=PR ${{ steps.create-pr.outputs.pull-request-url }} has been ${{ steps.create-pr.outputs.pull-request-operation || 'updated' }}." >> $GITHUB_OUTPUT
95+
echo "message=PR ${{ steps.create-pr.outputs.pull-request-url }} has been ${{ steps.create-pr.outputs.pull-request-operation || 'updated' }}." >> "$GITHUB_OUTPUT"
10096
fi
10197
- uses: 8398a7/action-slack@v3
10298
continue-on-error: true

‎.github/workflows/merge-alertmanager.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ jobs:
2020
upstream: prometheus/alertmanager
2121
downstream: openshift/prometheus-alertmanager
2222
sandbox: rhobs/prometheus-alertmanager
23-
go-version: "1.22"
2423
restore-upstream: >-
2524
CHANGELOG.md
2625
VERSION

‎.github/workflows/merge-flow.yaml‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ on:
77
default: '16'
88
required: false
99
type: string
10-
go-version:
11-
description: go version
12-
required: true
13-
type: string
1410
upstream:
1511
description: Upstream repo path in owner/repo format
1612
required: true
@@ -82,9 +78,11 @@ jobs:
8278
- name: Find github org name from repo name
8379
id: org
8480
run: |
85-
echo "upstream=$(dirname ${{ inputs.upstream }})" >> $GITHUB_OUTPUT
86-
echo "downstream=$(dirname ${{ inputs.downstream }})" >> $GITHUB_OUTPUT
87-
echo "sandbox=$(dirname ${{ inputs.sandbox }})" >> $GITHUB_OUTPUT
81+
{
82+
echo "upstream=$(dirname ${{ inputs.upstream }})"
83+
echo "downstream=$(dirname ${{ inputs.downstream }})"
84+
echo "sandbox=$(dirname ${{ inputs.sandbox }})"
85+
} >> "$GITHUB_OUTPUT"
8886
DOWNSTREAM_VERSION=$(curl -sL "https://raw.githubusercontent.com/${{ inputs.downstream }}/${{ inputs.downstream-branch }}/VERSION")
8987
if [[ "${DOWNSTREAM_VERSION}" =~ ^$|"404: Not Found" ]]; then
9088
# Strip the trailing URL from the expression.
@@ -125,7 +123,7 @@ jobs:
125123
echo "::notice::downstream ahead"
126124
exit 0
127125
fi
128-
- uses: actions/checkout@v2
126+
- uses: actions/checkout@v4
129127
with:
130128
repository: ${{ inputs.downstream }}
131129
fetch-depth: 0
@@ -177,10 +175,10 @@ jobs:
177175
echo "$version_from_tag" > VERSION
178176
git add VERSION
179177
git diff --cached --exit-code || git commit -s -m "[bot] add VERSION file with ${version_from_tag}"
180-
- uses: actions/setup-go@v2
178+
- uses: actions/setup-go@v5
181179
with:
182-
go-version: ${{ inputs.go-version }}
183-
- uses: actions/setup-node@v2
180+
go-version-file: go.mod
181+
- uses: actions/setup-node@v4
184182
with:
185183
node-version: ${{ inputs.node-version }}
186184
- name: Remove dependabot configuration
@@ -208,15 +206,15 @@ jobs:
208206
- name: Get auth token to create pull request for ${{ inputs.downstream }}
209207
if: github.event_name != 'pull_request'
210208
id: pr
211-
uses: getsentry/action-github-app-token@v1
209+
uses: getsentry/action-github-app-token@v3
212210
with:
213211
app_id: ${{ secrets.pr-app-id }}
214212
private_key: ${{ secrets.pr-app-private-key }}
215213
scope: ${{ steps.org.outputs.downstream }}
216214
- name: Get auth token to push to ${{ inputs.sandbox }}
217215
if: github.event_name != 'pull_request'
218216
id: cloner
219-
uses: getsentry/action-github-app-token@v1
217+
uses: getsentry/action-github-app-token@v3
220218
with:
221219
app_id: ${{ secrets.cloner-app-id }}
222220
private_key: ${{ secrets.cloner-app-private-key }}

‎.github/workflows/merge-kube-state-metrics.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ jobs:
2020
upstream: kubernetes/kube-state-metrics
2121
downstream: openshift/kube-state-metrics
2222
sandbox: rhobs/kube-state-metrics
23-
go-version: "1.22"
2423
restore-upstream: |
2524
CHANGELOG.md .github/ Dockerfile docs/ go.mod
2625
restore-downstream: OWNERS

‎.github/workflows/merge-metrics-server.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ jobs:
2020
upstream: kubernetes-sigs/metrics-server
2121
downstream: openshift/kubernetes-metrics-server
2222
sandbox: rhobs/kubernetes-metrics-server
23-
go-version: "1.22"
2423
restore-downstream: >-
2524
OWNERS
2625
charts/OWNERS

‎.github/workflows/merge-node-exporter.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
upstream: prometheus/node_exporter
2020
downstream: openshift/node_exporter
2121
sandbox: rhobs/node_exporter
22-
go-version: "1.21"
2322
restore-downstream: >-
2423
OWNERS
2524
restore-upstream: >-

‎.github/workflows/merge-prom-label-proxy.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
upstream: prometheus-community/prom-label-proxy
2020
downstream: openshift/prom-label-proxy
2121
sandbox: rhobs/prom-label-proxy
22-
go-version: "1.22"
2322
restore-downstream: >-
2423
OWNERS
2524
restore-upstream: >-

‎.github/workflows/merge-prometheus-operator.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
upstream: prometheus-operator/prometheus-operator
2020
downstream: openshift/prometheus-operator
2121
sandbox: rhobs/prometheus-operator
22-
go-version: "1.23"
2322
restore-upstream: >-
2423
CHANGELOG.md
2524
Documentation

‎.github/workflows/merge-prometheus.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
upstream: prometheus/prometheus
2020
downstream: openshift/prometheus
2121
sandbox: rhobs/prometheus
22-
go-version: "1.21"
2322
restore-upstream: >-
2423
CHANGELOG.md
2524
VERSION

0 commit comments

Comments
 (0)