Skip to content
Closed
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
23 changes: 9 additions & 14 deletions .github/workflows/pre-merge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,14 @@ jobs:
is-latest: false
is-stable: false

go-generate:
runs-on: ubuntu-26.04
steps:
- name: Checkout
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- name: Set up Go
uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
with:
go-version-file: 'go.mod'
- name: Verify generated mocks are up to date
run: |
go generate ./...
git diff --exit-code
go-generated:
# On a Renovate branch, pushes the regenerated mocks itself.
uses: scality/workflows/.github/workflows/go-generated.yaml@1c3bb83b992d0a512c08755606ee6439b26c463b # main, no release yet
secrets:
ACTIONS_APP_PRIVATE_KEY: ${{ secrets.ACTIONS_APP_PRIVATE_KEY }}
with:
push-to-renovate-branches: true

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With push mode on, the App's chore(deps): regenerate the code commit lands on the Renovate branch. Unless the App's bot email is in Renovate's gitIgnoredAuthors, Renovate treats the branch as edited by someone else and stops rebasing or updating it. The reusable workflow's step summary also says to add it. .github/renovate.json only extends github>scality/platform-renovate, and I couldn't read that preset to check. If the preset doesn't set it, add gitIgnoredAuthors here (or in #92).

actions-app-id: ${{ vars.ACTIONS_APP_ID }}

lint:
runs-on: ubuntu-26.04
Expand Down Expand Up @@ -72,7 +67,7 @@ jobs:
if: always()
needs:
- build
- go-generate
- go-generated
- lint
- test
- test-e2e
Expand Down
Loading