ci: update-flake: use one atomic commit
Use one atomic commit to simplify the commit history and prevent the previous commits from individually breaking CI.
This commit is contained in:
parent
a1451bc404
commit
b01dbcdc08
1 changed files with 5 additions and 14 deletions
19
.github/workflows/update-flake.yml
vendored
19
.github/workflows/update-flake.yml
vendored
|
|
@ -57,30 +57,21 @@ jobs:
|
||||||
|
|
||||||
- name: update lock files
|
- name: update lock files
|
||||||
run: |
|
run: |
|
||||||
nix flake update \
|
nix flake update
|
||||||
--commit-lock-file \
|
nix flake update --flake ./flake/dev
|
||||||
--option commit-lock-file-summary "flake: update public inputs"
|
|
||||||
|
|
||||||
nix flake update \
|
git add {,flake/dev/}flake.lock
|
||||||
--commit-lock-file \
|
|
||||||
--flake ./flake/dev \
|
|
||||||
--option commit-lock-file-summary "flake: update dev inputs"
|
|
||||||
|
|
||||||
# The nixpkgs maintainers may have changed, so keep all-maintainers
|
# The nixpkgs maintainers may have changed, so keep all-maintainers
|
||||||
# in sync
|
# in sync
|
||||||
if nix run .#all-maintainers; then
|
if nix run .#all-maintainers; then
|
||||||
git add generated/all-maintainers.nix
|
git add generated/all-maintainers.nix
|
||||||
|
|
||||||
if
|
|
||||||
! git commit --message "stylix: update all-maintainers list"
|
|
||||||
then
|
|
||||||
echo "::debug::generated/all-maintainers.nix has no changes"
|
|
||||||
fi
|
|
||||||
|
|
||||||
else
|
else
|
||||||
echo "::error::failed to update generated/all-maintainers.nix"
|
echo "::error::failed to update generated/all-maintainers.nix"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
git commit --message "flake: update all inputs"
|
||||||
|
|
||||||
- name: create pull request
|
- name: create pull request
|
||||||
env:
|
env:
|
||||||
GH_TOKEN: ${{ steps.generate-token.outputs.token }}
|
GH_TOKEN: ${{ steps.generate-token.outputs.token }}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue