Skip to content

Commit

Permalink
chore: bump deprecated actions
Browse files Browse the repository at this point in the history
Signed-off-by: Simon Pasquier <[email protected]>
  • Loading branch information
simonpasquier committed Nov 12, 2024
1 parent 6176eba commit 3702fe3
Show file tree
Hide file tree
Showing 13 changed files with 22 additions and 36 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/actions-ci-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: reviewdog/action-actionlint@v1
with:
fail_on_error: "true"
22 changes: 9 additions & 13 deletions .github/workflows/cmo-make-targets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ name: cluster-monitoring-operator make targets
on:
workflow_call:
inputs:
go-version:
description: go version
required: true
type: string
pr-title:
description: Pull request title.
required: true
Expand Down Expand Up @@ -41,40 +37,40 @@ jobs:
execute-make-targets:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
repository: openshift/cluster-monitoring-operator
ref: master
- uses: actions/setup-go@v2
- uses: actions/setup-go@v5
with:
go-version: ${{ inputs.go-version }}
go-version-file: go.mod
- name: Execute make targets - ${{ inputs.make-targets }}
run: make ${{ inputs.make-targets }}
- name: Ignore if change is only in jsonnetfile.lock.json
run: |
# Reset jsonnetfile.lock.json if no dependencies were updated
changedFiles=$(git diff --name-only | grep -v 'jsonnetfile.lock.json' | wc -l)
changedFiles=$(git diff --name-only | grep -cv 'jsonnetfile.lock.json')
if [[ "$changedFiles" -eq 0 ]]; then
git checkout -- jsonnet/jsonnetfile.lock.json;
fi
- name: get pr creation app token
id: pr
uses: getsentry/action-github-app-token@v1
uses: getsentry/action-github-app-token@v3
with:
app_id: ${{ secrets.pr-app-id }}
private_key: ${{ secrets.pr-app-private-key }}
scope: openshift
- name: get cloner app token
id: cloner
uses: getsentry/action-github-app-token@v1
uses: getsentry/action-github-app-token@v3
with:
app_id: ${{ secrets.cloner-app-id }}
private_key: ${{ secrets.cloner-app-private-key }}
scope: rhobs
- name: Find branch name
id: branch
run: |
echo "sandbox=$(echo ${{ inputs.make-targets }} | sed 's/ /-/g')" >> $GITHUB_OUTPUT
echo sandbox="$(echo ${{ inputs.make-targets }} | sed 's/ /-/g')" >> "$GITHUB_OUTPUT"
- name: Create Pull Request
id: create-pr
uses: rhobs/create-pull-request@v3
Expand All @@ -94,9 +90,9 @@ jobs:
id: slack-message
run: |
if [ "${{ steps.create-pr.outputs.pull-request-url }}" == "" ]; then
echo "message=No changes detected." >> $GITHUB_OUTPUT
echo "message=No changes detected." >> "$GITHUB_OUTPUT"
else
echo "message=PR ${{ steps.create-pr.outputs.pull-request-url }} has been ${{ steps.create-pr.outputs.pull-request-operation || 'updated' }}." >> $GITHUB_OUTPUT
echo "message=PR ${{ steps.create-pr.outputs.pull-request-url }} has been ${{ steps.create-pr.outputs.pull-request-operation || 'updated' }}." >> "$GITHUB_OUTPUT"
fi
- uses: 8398a7/action-slack@v3
continue-on-error: true
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/merge-alertmanager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ jobs:
upstream: prometheus/alertmanager
downstream: openshift/prometheus-alertmanager
sandbox: rhobs/prometheus-alertmanager
go-version: "1.22"
restore-upstream: >-
CHANGELOG.md
VERSION
Expand Down
24 changes: 11 additions & 13 deletions .github/workflows/merge-flow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ on:
default: '16'
required: false
type: string
go-version:
description: go version
required: true
type: string
upstream:
description: Upstream repo path in owner/repo format
required: true
Expand Down Expand Up @@ -82,9 +78,11 @@ jobs:
- name: Find github org name from repo name
id: org
run: |

Check failure on line 80 in .github/workflows/merge-flow.yaml

View workflow job for this annotation

GitHub Actions / actionlint

[actionlint] reported by reviewdog 🐶 shellcheck reported issue in this script: SC2086:info:22:52: Double quote to prevent globbing and word splitting [shellcheck] Raw Output: .github/workflows/merge-flow.yaml:80:9: shellcheck reported issue in this script: SC2086:info:22:52: Double quote to prevent globbing and word splitting [shellcheck]
echo "upstream=$(dirname ${{ inputs.upstream }})" >> $GITHUB_OUTPUT
echo "downstream=$(dirname ${{ inputs.downstream }})" >> $GITHUB_OUTPUT
echo "sandbox=$(dirname ${{ inputs.sandbox }})" >> $GITHUB_OUTPUT
{
echo "upstream=$(dirname ${{ inputs.upstream }})"
echo "downstream=$(dirname ${{ inputs.downstream }})"
echo "sandbox=$(dirname ${{ inputs.sandbox }})"
} >> "$GITHUB_OUTPUT"
DOWNSTREAM_VERSION=$(curl -sL "https://raw.githubusercontent.com/${{ inputs.downstream }}/${{ inputs.downstream-branch }}/VERSION")
if [[ "${DOWNSTREAM_VERSION}" =~ ^$|"404: Not Found" ]]; then
# Strip the trailing URL from the expression.
Expand Down Expand Up @@ -125,7 +123,7 @@ jobs:
echo "::notice::downstream ahead"
exit 0
fi
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
repository: ${{ inputs.downstream }}
fetch-depth: 0
Expand Down Expand Up @@ -175,10 +173,10 @@ jobs:
echo "$version_from_tag" > VERSION
git add VERSION
git diff --cached --exit-code || git commit -s -m "[bot] add VERSION file with ${version_from_tag}"
- uses: actions/setup-go@v2
- uses: actions/setup-go@v5
with:
go-version: ${{ inputs.go-version }}
- uses: actions/setup-node@v2
go-version-file: go.mod
- uses: actions/setup-node@v4
with:
node-version: ${{ inputs.node-version }}
- name: Remove dependabot configuration
Expand Down Expand Up @@ -206,15 +204,15 @@ jobs:
- name: Get auth token to create pull request for ${{ inputs.downstream }}
if: github.event_name != 'pull_request'
id: pr
uses: getsentry/action-github-app-token@v1
uses: getsentry/action-github-app-token@v3
with:
app_id: ${{ secrets.pr-app-id }}
private_key: ${{ secrets.pr-app-private-key }}
scope: ${{ steps.org.outputs.downstream }}
- name: Get auth token to push to ${{ inputs.sandbox }}
if: github.event_name != 'pull_request'
id: cloner
uses: getsentry/action-github-app-token@v1
uses: getsentry/action-github-app-token@v3
with:
app_id: ${{ secrets.cloner-app-id }}
private_key: ${{ secrets.cloner-app-private-key }}
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/merge-kube-state-metrics.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ jobs:
upstream: kubernetes/kube-state-metrics
downstream: openshift/kube-state-metrics
sandbox: rhobs/kube-state-metrics
go-version: "1.22"
restore-upstream: |
CHANGELOG.md .github/ Dockerfile docs/ go.mod
restore-downstream: OWNERS
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/merge-metrics-server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ jobs:
upstream: kubernetes-sigs/metrics-server
downstream: openshift/kubernetes-metrics-server
sandbox: rhobs/kubernetes-metrics-server
go-version: "1.22"
restore-downstream: >-
OWNERS
charts/OWNERS
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/merge-node-exporter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ jobs:
upstream: prometheus/node_exporter
downstream: openshift/node_exporter
sandbox: rhobs/node_exporter
go-version: "1.21"
restore-downstream: >-
OWNERS
restore-upstream: >-
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/merge-prom-label-proxy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ jobs:
upstream: prometheus-community/prom-label-proxy
downstream: openshift/prom-label-proxy
sandbox: rhobs/prom-label-proxy
go-version: "1.22"
restore-downstream: >-
OWNERS
restore-upstream: >-
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/merge-prometheus-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ jobs:
upstream: prometheus-operator/prometheus-operator
downstream: openshift/prometheus-operator
sandbox: rhobs/prometheus-operator
go-version: "1.23"
restore-upstream: >-
CHANGELOG.md
Documentation
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/merge-prometheus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ jobs:
upstream: prometheus/prometheus
downstream: openshift/prometheus
sandbox: rhobs/prometheus
go-version: "1.21"
restore-upstream: >-
CHANGELOG.md
VERSION
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/merge-thanos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ jobs:
upstream: thanos-io/thanos
downstream: openshift/thanos
sandbox: rhobs/thanos
go-version: "1.22"
restore-upstream: >-
CHANGELOG.md
VERSION
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/update-cmo-deps-versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ jobs:
versions-update:
uses: ./.github/workflows/cmo-make-targets.yaml
with:
go-version: "1.22"
make-targets: versions generate
pr-title: "[bot] Synchronize versions of the downstream components"
pr-body: |
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/update-cmo-jsonnet-deps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ jobs:
jsonnet-update:
uses: ./.github/workflows/cmo-make-targets.yaml
with:
go-version: "1.23"
make-targets: update generate
pr-title: "[bot] Update jsonnet dependencies"
pr-body: |
Expand Down

0 comments on commit 3702fe3

Please sign in to comment.