Skip to content

Commit

Permalink
update-nixpkgs: update for the new fc-release-tools versions
Browse files Browse the repository at this point in the history
This version sends matrix notifications on graceful failures and hard-resets
nixpkgs with a safety belt instead of rebasing. This fixes the problems
when a manual rebase conflict resolution is required.

PL-133100
  • Loading branch information
leona-ya committed Dec 18, 2024
1 parent df18bb1 commit 65f045a
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 1 deletion.
9 changes: 8 additions & 1 deletion .github/workflows/update-nixpkgs-cleanup.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: update-nixpkgs-cleanup

on:
pull_request:
pull_request_target:
types:
- closed

Expand All @@ -10,6 +10,11 @@ jobs:
if: github.event.pull_request.merged == true && startsWith(github.head_ref, 'nixpkgs-auto-update/')
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
path: 'fc-nixos'
fetch-depth: 0
- uses: actions/checkout@v4
with:
repository: flyingcircusio/fc-nixos-release-tools
Expand Down Expand Up @@ -40,7 +45,9 @@ jobs:
- run: |
./result/bin/update-nixpkgs cleanup \
--merged-pr-id ${{ github.event.number }} \
--fc-nixos-dir fc-nixos \
--nixpkgs-dir nixpkgs \
--nixpkgs-origin-url https://x-access-token:${{steps.app-token.outputs.token}}@github.com/flyingcircusio/nixpkgs.git
env:
GH_TOKEN: ${{ steps.app-token.outputs.token }}
MATRIX_HOOKSHOT_URL: ${{ secrets.MATRIX_HOOKSHOT_URL }}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!--
A new changelog entry.
Delete placeholder items that do not apply. Empty sections will be removed
automatically during release.
Leave the XX.XX as is: this is a placeholder and will be automatically filled
correctly during the release and helps when backporting over multiple platform
branches.
-->

### Impact


### NixOS XX.XX platform

- Internal: Prepare update-nixpkgs for new fc-release-tools versions

0 comments on commit 65f045a

Please sign in to comment.