Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/merge-acm-flow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
downstream-branch:
description: Downstream branch to create PR
required: false
default: release-2.14
default: release-2.15
type: string
sandbox:
description: Sandbox repo path in owner/repo format. Used as a base to create PR against downstream.
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/merge-acm-grafana.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
upstream: grafana/grafana
downstream: stolostron/grafana
sandbox: rhobs/acm-grafana
go-version: "1.23"
go-version: "1.24"
node-version: "22"
go-mod-tidy: false
restore-downstream: >-
Expand All @@ -38,9 +38,10 @@ jobs:
lerna.json
package.json
packages
public/app/
public/
yarn.lock
SECURITY.md
.bingo/
assets-cmd: |
# get rid of old assets as new filenames are generated
rm -rf ./public/build/
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/merge-acm-kube-state-metrics.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@ jobs:
upstream: kubernetes/kube-state-metrics
downstream: stolostron/kube-state-metrics
sandbox: rhobs/acm-kube-state-metrics
go-version: "1.23"
go-version: "1.24"
restore-upstream: >-
CHANGELOG.md
VERSION
CHANGELOG.md
restore-downstream: >-
OWNERS
docs
downstream-version-expression: |
sed -n -E 's/^version: \"*([0-9]+\.[0-9]+\.[0-9]+)\"$/v\1/p' https://raw.githubusercontent.com/openshift/kube-state-metrics/main/data.yaml
secrets:
pr-app-id: ${{ secrets.ACM_APP_ID }}
pr-app-private-key: ${{ secrets.ACM_APP_PRIVATE_KEY }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/merge-acm-node-exporter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
upstream: prometheus/node_exporter
downstream: stolostron/node-exporter
sandbox: rhobs/acm-node-exporter
go-version: "1.23"
go-version: "1.24"
restore-downstream: >-
OWNERS
restore-upstream: >-
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/merge-acm-prometheus-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
upstream: prometheus-operator/prometheus-operator
downstream: stolostron/prometheus-operator
sandbox: rhobs/acm-prometheus-operator
go-version: "1.23"
go-version: "1.24"
restore-upstream: >-
CHANGELOG.md
Documentation
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/merge-acm-prometheus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
upstream: prometheus/prometheus
downstream: stolostron/prometheus
sandbox: rhobs/acm-prometheus
go-version: "1.23"
go-version: "1.24"
restore-upstream: >-
CHANGELOG.md
VERSION
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/merge-acm-thanos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
upstream: thanos-io/thanos
downstream: stolostron/thanos
sandbox: rhobs/acm-thanos
go-version: "1.23"
go-version: "1.24"
restore-downstream: >-
OWNERS
restore-upstream: >-
Expand Down
Loading