Compare commits

..

4 commits

Author SHA1 Message Date
Ingolf Wagner da5af11569
nix flake check fixes
All checks were successful
Build all NixOS Configurations / nix build (push) Successful in 3m22s
2024-07-20 23:33:19 +02:00
Ingolf Wagner 399c99aa44
try to fix update routine
All checks were successful
Build all NixOS Configurations / nix build (push) Successful in 6m54s
2024-07-20 23:25:07 +02:00
Ingolf Wagner 34a42131b2
try to fix update routine
Some checks failed
Build all NixOS Configurations / nix build (push) Has been cancelled
2024-07-20 23:19:11 +02:00
Ingolf Wagner 87ab03b22e
reformat
All checks were successful
Build all NixOS Configurations / nix build (push) Successful in 6m54s
2024-07-20 23:09:29 +02:00
4 changed files with 46 additions and 21 deletions

View file

@ -26,7 +26,8 @@ jobs:
- run: nix flake archive - run: nix flake archive
- run: nix flake check --verbose --log-format raw - name: nix flake check
run: nix flake check --verbose --log-format raw
- name: teardown ssh - name: teardown ssh
if: always() if: always()

View file

@ -2,32 +2,54 @@ name: Update Nix flakes and commit changes
on: on:
schedule: schedule:
- cron: "0 23 * * *" - cron: "5/10 * * * *"
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: Update Nix flakes - name: setup ssh
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 --staged --quiet || (git commit -am "Update Nix flakes" && git push) git diff --quiet && \
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

View file

@ -170,11 +170,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1721508205, "lastModified": 1720813949,
"narHash": "sha256-X4xVtKAkA/gVqIaCw0L5Rk9062VqlHiH0VK5En5Oi5s=", "narHash": "sha256-ZqoP7VDuliqGiBo54aYOv5VMjeX+bNaOKCXfDflj+xc=",
"owner": "mrvandalo", "owner": "mrvandalo",
"repo": "clan-fact-generators", "repo": "clan-fact-generators",
"rev": "b3fb36c18871861f510330c272b455eb718cd3e4", "rev": "aa5c71bf46b453233945380b43fac2fc3d256efb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -653,11 +653,11 @@
}, },
"nixpkgs-legacy_2405": { "nixpkgs-legacy_2405": {
"locked": { "locked": {
"lastModified": 1721409541, "lastModified": 1721226092,
"narHash": "sha256-b6PLr0Ty7JPDBtJtjnYzlBf02bbH9alWMAgispMkTwk=", "narHash": "sha256-UBvzVpo5sXSi2S/Av+t+Q+C2mhMIw/LBEZR+d6NMjws=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0c53b6b8c2a3e46c68e04417e247bba660689c9d", "rev": "c716603a63aca44f39bef1986c13402167450e0a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -681,11 +681,11 @@
}, },
"nixpkgs-unstable-small": { "nixpkgs-unstable-small": {
"locked": { "locked": {
"lastModified": 1721481798, "lastModified": 1721393053,
"narHash": "sha256-GOwbtcTDS7KnVseckF+H8OCRNrwYEqCZ34QOZ+i51e4=", "narHash": "sha256-xNiw9gIxyF6xsyXCiFESPjxMjuVAfmr4sBpM9u2l5io=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a2aeb0fcca8ef063c03ef57fa5de49084d4e9687", "rev": "a0691657e9634cfc001f02995cca394025e3e940",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1033,11 +1033,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721478802, "lastModified": 1721429336,
"narHash": "sha256-+WMQs0fMAmpWPsKNgIFQoKLtvS4qtTj+mC++cD1May4=", "narHash": "sha256-DTJUvI4Xkj4KC5tdq15OEUkPpk7Ebvqcz356dIT6jtY=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "6f36b27afd7b7ac8664bb62b7b27728540972c82", "rev": "6bbae4f85b891df2e6e48b649919420434088507",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -5,6 +5,8 @@
../../modules ../../modules
]; ];
system.stateVersion = "24.11";
components.mainUser.enable = true; components.mainUser.enable = true;
components.network.enable = true; components.network.enable = true;