Skip to content

Commit d4bc146

Browse files
committed
update-nixpkgs: update for the new fc-release-tools versions
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
1 parent 2897916 commit d4bc146

File tree

2 files changed

+27
-1
lines changed

2 files changed

+27
-1
lines changed

.github/workflows/update-nixpkgs-cleanup.yaml

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: update-nixpkgs-cleanup
22

33
on:
4-
pull_request:
4+
pull_request_target:
55
types:
66
- closed
77

@@ -10,6 +10,11 @@ jobs:
1010
if: github.event.pull_request.merged == true && startsWith(github.head_ref, 'nixpkgs-auto-update/')
1111
runs-on: ubuntu-latest
1212
steps:
13+
- uses: actions/checkout@v4
14+
with:
15+
ref: ${{ github.event.pull_request.head.sha }}
16+
path: 'fc-nixos'
17+
fetch-depth: 0
1318
- uses: actions/checkout@v4
1419
with:
1520
repository: flyingcircusio/fc-nixos-release-tools
@@ -40,7 +45,9 @@ jobs:
4045
- run: |
4146
./result/bin/update-nixpkgs cleanup \
4247
--merged-pr-id ${{ github.event.number }} \
48+
--fc-nixos-dir fc-nixos \
4349
--nixpkgs-dir nixpkgs \
4450
--nixpkgs-origin-url https://x-access-token:${{steps.app-token.outputs.token}}@github.com/flyingcircusio/nixpkgs.git
4551
env:
4652
GH_TOKEN: ${{ steps.app-token.outputs.token }}
53+
MATRIX_HOOKSHOT_URL: ${{ secrets.MATRIX_HOOKSHOT_URL }}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<!--
2+
3+
A new changelog entry.
4+
5+
Delete placeholder items that do not apply. Empty sections will be removed
6+
automatically during release.
7+
8+
Leave the XX.XX as is: this is a placeholder and will be automatically filled
9+
correctly during the release and helps when backporting over multiple platform
10+
branches.
11+
12+
-->
13+
14+
### Impact
15+
16+
17+
### NixOS XX.XX platform
18+
19+
- Internal: Prepare update-nixpkgs for new fc-release-tools versions

0 commit comments

Comments
 (0)