Compare commits
1 commit
da5af11569
...
dd232e3ae1
Author | SHA1 | Date | |
---|---|---|---|
|
dd232e3ae1 |
4 changed files with 21 additions and 46 deletions
|
@ -26,8 +26,7 @@ jobs:
|
||||||
|
|
||||||
- run: nix flake archive
|
- run: nix flake archive
|
||||||
|
|
||||||
- name: nix flake check
|
- run: nix flake check --verbose --log-format raw
|
||||||
run: nix flake check --verbose --log-format raw
|
|
||||||
|
|
||||||
- name: teardown ssh
|
- name: teardown ssh
|
||||||
if: always()
|
if: always()
|
||||||
|
|
|
@ -2,54 +2,32 @@ name: Update Nix flakes and commit changes
|
||||||
|
|
||||||
on:
|
on:
|
||||||
schedule:
|
schedule:
|
||||||
- cron: "5/10 * * * *"
|
- cron: "0 23 * * *"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
update-and-commit:
|
update-and-commit:
|
||||||
runs-on: native
|
runs-on: native
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
with:
|
with:
|
||||||
ref: "update"
|
ref: "update"
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: setup git
|
- name: Setup Git
|
||||||
run: |
|
run: |
|
||||||
git config --local user.email "action@git.ingolf-wagner.de"
|
git config --local user.email "action@git.ingolf-wagner.de"
|
||||||
git config --local user.name "Forgejo Action"
|
git config --local user.name "Forgejo Action"
|
||||||
|
|
||||||
- name: rebase with main branch
|
- name: Rebase with main branch
|
||||||
run: |
|
run: |
|
||||||
git fetch origin main
|
git fetch origin main
|
||||||
git rebase origin/main
|
git rebase origin/main
|
||||||
|
|
||||||
- name: setup ssh
|
- name: Update Nix flakes
|
||||||
run: |
|
|
||||||
cat <<EOF > .id_rsa
|
|
||||||
${{ secrets.SSH_KEY }}
|
|
||||||
EOF
|
|
||||||
chmod 600 .id_rsa
|
|
||||||
|
|
||||||
eval $(ssh-agent)
|
|
||||||
ssh-add .id_rsa
|
|
||||||
|
|
||||||
cat <<EOF > "$GITHUB_ENV"
|
|
||||||
SSH_AUTH_SOCK="$SSH_AUTH_SOCK"
|
|
||||||
SSH_AGENT_PID=$SSH_AGENT_PID
|
|
||||||
EOF
|
|
||||||
|
|
||||||
- name: update nix flakes
|
|
||||||
run: nix flake update
|
run: nix flake update
|
||||||
|
|
||||||
- name: commit and push changes
|
- name: Commit and Push changes
|
||||||
run: |
|
run: |
|
||||||
git diff --quiet && \
|
git diff --quiet && git diff --staged --quiet || (git commit -am "Update Nix flakes" && git push)
|
||||||
git diff --staged --quiet || \
|
|
||||||
(git commit -am "Update Nix flakes" && git push)
|
|
||||||
|
|
||||||
- name: teardown ssh
|
|
||||||
if: always()
|
|
||||||
run: |
|
|
||||||
echo $SSH_AGENT_PID
|
|
||||||
kill $SSH_AGENT_PID
|
|
||||||
|
|
24
flake.lock
24
flake.lock
|
@ -170,11 +170,11 @@
|
||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720813949,
|
"lastModified": 1721508205,
|
||||||
"narHash": "sha256-ZqoP7VDuliqGiBo54aYOv5VMjeX+bNaOKCXfDflj+xc=",
|
"narHash": "sha256-X4xVtKAkA/gVqIaCw0L5Rk9062VqlHiH0VK5En5Oi5s=",
|
||||||
"owner": "mrvandalo",
|
"owner": "mrvandalo",
|
||||||
"repo": "clan-fact-generators",
|
"repo": "clan-fact-generators",
|
||||||
"rev": "aa5c71bf46b453233945380b43fac2fc3d256efb",
|
"rev": "b3fb36c18871861f510330c272b455eb718cd3e4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -653,11 +653,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-legacy_2405": {
|
"nixpkgs-legacy_2405": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1721226092,
|
"lastModified": 1721409541,
|
||||||
"narHash": "sha256-UBvzVpo5sXSi2S/Av+t+Q+C2mhMIw/LBEZR+d6NMjws=",
|
"narHash": "sha256-b6PLr0Ty7JPDBtJtjnYzlBf02bbH9alWMAgispMkTwk=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c716603a63aca44f39bef1986c13402167450e0a",
|
"rev": "0c53b6b8c2a3e46c68e04417e247bba660689c9d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -681,11 +681,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable-small": {
|
"nixpkgs-unstable-small": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1721393053,
|
"lastModified": 1721481798,
|
||||||
"narHash": "sha256-xNiw9gIxyF6xsyXCiFESPjxMjuVAfmr4sBpM9u2l5io=",
|
"narHash": "sha256-GOwbtcTDS7KnVseckF+H8OCRNrwYEqCZ34QOZ+i51e4=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "a0691657e9634cfc001f02995cca394025e3e940",
|
"rev": "a2aeb0fcca8ef063c03ef57fa5de49084d4e9687",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1033,11 +1033,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1721429336,
|
"lastModified": 1721478802,
|
||||||
"narHash": "sha256-DTJUvI4Xkj4KC5tdq15OEUkPpk7Ebvqcz356dIT6jtY=",
|
"narHash": "sha256-+WMQs0fMAmpWPsKNgIFQoKLtvS4qtTj+mC++cD1May4=",
|
||||||
"owner": "danth",
|
"owner": "danth",
|
||||||
"repo": "stylix",
|
"repo": "stylix",
|
||||||
"rev": "6bbae4f85b891df2e6e48b649919420434088507",
|
"rev": "6f36b27afd7b7ac8664bb62b7b27728540972c82",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -5,8 +5,6 @@
|
||||||
../../modules
|
../../modules
|
||||||
];
|
];
|
||||||
|
|
||||||
system.stateVersion = "24.11";
|
|
||||||
|
|
||||||
components.mainUser.enable = true;
|
components.mainUser.enable = true;
|
||||||
components.network.enable = true;
|
components.network.enable = true;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue