Skip to content

Implementation of flake bump auto approve and merge#154

Open
pkr4711 wants to merge 1 commit into
cyberus-technology:gardenlinuxfrom
pkr4711:auto-flake-bump
Open

Implementation of flake bump auto approve and merge#154
pkr4711 wants to merge 1 commit into
cyberus-technology:gardenlinuxfrom
pkr4711:auto-flake-bump

Conversation

@pkr4711
Copy link
Copy Markdown

@pkr4711 pkr4711 commented May 5, 2026

for details please look into: ci/README.auto.approve.md

Pipeline tests are here

@pkr4711 pkr4711 requested review from amphi and phip1611 May 5, 2026 08:55
@pkr4711 pkr4711 force-pushed the auto-flake-bump branch from a653820 to 81dfd61 Compare May 5, 2026 09:05
Comment thread .github/workflows/flake-bump.yaml Outdated
--method PUT \
-H "Accept: application/vnd.github+json" \
-H "X-GitHub-Api-Version: 2026-03-10" \
/repos/daedalus-ca/test-auto-approve/pulls/${{ github.event.number }}/merge \
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

why is there a reference to daedalus-ca here?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

It's good that you're doing a review. I'll fix it. I tested the workflow in this organization.

Comment thread .github/workflows/flake-bump.yaml Outdated
Comment on lines +44 to +57
# - name: Get App User ID
# id: get_user_id
# uses: octokit/request-action@v2.x
# with:
# route: "/users/${{ steps.generate_token.outputs.app-slug }}[bot]"
# env:
# GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
# - name: Setup Git
# shell: bash
# run: |
# git config --global --add safe.directory $PWD
# git config --global user.name '${{ steps.generate_token.outputs.app-slug }}[bot]'
# git config --global user.email '${{ fromJson(steps.get_user_id.outputs.data).id }}+${{ steps.generate_token.outputs.app-slug }}[bot]@users.noreply.github.com'
# git config --global push.autoSetupRemote 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.

Can these lines be deleted?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Yes we can.

Copy link
Copy Markdown
Member

@phip1611 phip1611 left a comment

Choose a reason for hiding this comment

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

I'd prefer if you elaborate on the git commit message a little. something like:

ci: implementation of flake bump auto approve and merge

Add a GitHub workflow to automatically validate and merge pull requests
that only bump flake.lock. This reduces manual review overhead for routine
dependency updates while keeping the merge path constrained and auditable.

The workflow uses a dedicated gitlint config and custom rule to ensure each
eligible commit changes exactly flake.lock. Documentation is added for the
required GitHub App, secrets, permissions, and branch-ruleset bypass setup.

Signed-off-by: Paul Kroeher <paul.kroeher@cyberus-technology.de>
On-behalf-of: SAP paul.kroeher@sap.com

Comment thread .github/workflows/flake-bump.yaml Outdated
private-key: ${{ secrets.GH_AUTO_APPROVE_APP_PRIVATE_KEY }}
owner: daedalus-ca
repositories: test-auto-approve
# - name: Get App User ID
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

why are so many comment lines here?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

I'll remove this.

@pkr4711 pkr4711 force-pushed the auto-flake-bump branch from 81dfd61 to 4df33bc Compare May 8, 2026 05:52
Add a GitHub workflow to automatically validate and merge
pull requests that only bump flake.lock.
This reduces manual review overhead for routine
dependency updates while keeping the merge path
constrained and auditable.

The workflow uses a dedicated gitlint config and
custom rule to ensure each eligible commit changes
exactly flake.lock. Documentation is added for the
required GitHub App, secrets, permissions, and
branch-ruleset bypass setup.

Signed-off-by: Paul Kroeher <paul.kroeher@cyberus-technology.de>

On-behalf-of: SAP paul.kroeher@sap.com
@pkr4711 pkr4711 force-pushed the auto-flake-bump branch from 4df33bc to 0350f6a Compare May 8, 2026 06:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants