diff --git a/.github/workflows/merge-acm-alertmanager.yaml b/.github/workflows/merge-acm-alertmanager.yaml new file mode 100644 index 0000000..720442d --- /dev/null +++ b/.github/workflows/merge-acm-alertmanager.yaml @@ -0,0 +1,45 @@ +name: ACM Alertmanager merger + +on: + workflow_dispatch: + schedule: + - cron: '0 0 * * 1' #@weekly + pull_request: + paths: + - '.github/workflows/merge-flow.yaml' + - '.github/workflows/merge-alertmanager.yaml' + push: + paths: + - '.github/workflows/merge-flow.yaml' + - '.github/workflows/merge-alertmanager.yaml' + +jobs: + alertmanager-merge: + uses: ./.github/workflows/merge-acm-flow.yaml + with: + upstream: prometheus/alertmanager + downstream: stolostron/prometheus-alertmanager + sandbox: rhobs/acm-prometheus-alertmanager + go-version: "1.22" + restore-upstream: >- + CHANGELOG.md + VERSION + go.mod + go.sum + assets-cmd: | + # Only compress assets if assets actually changed + # The git diff relies on gits remote naming. The merge-flow checks out + # $downstream as origin at the time of writing this code. + if ! git diff --exit-code origin/master ui/react-app; then + make assets-compress + find ui/react-app -type f -name '*.gz' -exec git add {} \; + git add ui/react-app/embed.go + git diff --cached --exit-code || git commit -s -m "[bot] assets: generate" + fi + + secrets: + pr-app-id: ${{ secrets.ACM_APP_ID }} + pr-app-private-key: ${{ secrets.ACM_APP_PRIVATE_KEY }} + cloner-app-id: ${{ secrets.ACM_CLONER_APP_ID }} + cloner-app-private-key: ${{ secrets.ACM_CLONER_APP_PRIVATE_KEY }} + slack-webhook-url: ${{ secrets.ACM_SLACK_WEBHOOK_URL }} \ No newline at end of file diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml index b1ef3be..bbf1b7f 100644 --- a/.github/workflows/merge-acm-flow.yaml +++ b/.github/workflows/merge-acm-flow.yaml @@ -214,7 +214,7 @@ jobs: uses: rhobs/acm-create-pull-request@push-to-fork-token id: create-pr with: - title: "[bot] Bump ${{ inputs.downstream }} to ${{ steps.upstream.outputs.release }}" + title: "[ACM Obs bot] Bump ${{ inputs.downstream }} to ${{ steps.upstream.outputs.release }}" body: | ## Description This is an automated version bump from CI. diff --git a/.github/workflows/merge-acm-prometheus-operator.yaml b/.github/workflows/merge-acm-prometheus-operator.yaml index 20bb8f2..96b37a2 100644 --- a/.github/workflows/merge-acm-prometheus-operator.yaml +++ b/.github/workflows/merge-acm-prometheus-operator.yaml @@ -3,7 +3,7 @@ name: ACM Prometheus Operator merger on: workflow_dispatch: schedule: - - cron: '0 0 * * *' #@daily + - cron: '0 0 * * 1' #@weekly pull_request: paths: - '.github/workflows/merge-acm-flow.yaml' diff --git a/.github/workflows/merge-acm-prometheus.yaml b/.github/workflows/merge-acm-prometheus.yaml index 22f04f6..cd8d2b7 100644 --- a/.github/workflows/merge-acm-prometheus.yaml +++ b/.github/workflows/merge-acm-prometheus.yaml @@ -3,7 +3,7 @@ name: ACM Prometheus merger on: workflow_dispatch: schedule: - - cron: '0 0 * * *' #@daily + - cron: '0 0 * * 1' #@weekly pull_request: paths: - '.github/workflows/merge-acm-flow.yaml'