Compare commits

..

3 commits

Author SHA1 Message Date
Forgejo Action
77acf0623d Update Nix flakes 2024-07-21 10:21:12 +02:00
Forgejo Action
fbceae8fd4 Update Nix flakes 2024-07-21 09:11:22 +02:00
Forgejo Action
95c81835b2 Update Nix flakes 2024-07-20 23:47:16 +02:00
3 changed files with 83 additions and 70 deletions

View file

@ -9,33 +9,40 @@ jobs:
steps:
- uses: actions/checkout@v4
# - name: setup ssh
# run: |
# cat <<EOF > .id_rsa
# ${{ secrets.SSH_KEY }}
# EOF
# chmod 600 .id_rsa
#
# eval $(ssh-agent)
# ssh-add .id_rsa
#
# nix flake archive
#
# echo $SSH_AGENT_PID
# kill $SSH_AGENT_PID
#
# - name: nix flake check
# run: nix flake check --verbose --log-format raw
- name: setup ssh
run: |
cat <<EOF > .id_rsa
${{ secrets.SSH_KEY }}
EOF
chmod 600 .id_rsa
eval $(ssh-agent)
ssh-add .id_rsa
#- name: nix build orbi
# run: nix build .#nixosConfigurations.orbi.config.system.build.toplevel
cat <<EOF > "$GITHUB_ENV"
SSH_AUTH_SOCK="$SSH_AUTH_SOCK"
SSH_AGENT_PID=$SSH_AGENT_PID
EOF
#- name: nix build cream
# run: nix build .#nixosConfigurations.cream.config.system.build.toplevel
- run: nix flake archive
#- name: nix build cherry
# run: nix build .#nixosConfigurations.cherry.config.system.build.toplevel
- name: nix flake check
run: nix flake check --verbose --log-format raw
#- name: nix build chungus
# run: nix build .#nixosConfigurations.chungus.config.system.build.toplevel
- name: teardown ssh
if: always()
run: |
echo $SSH_AGENT_PID
kill $SSH_AGENT_PID
- name: nix build orbi
run: nix build .#nixosConfigurations.orbi.config.system.build.toplevel
- name: nix build cream
run: nix build .#nixosConfigurations.cream.config.system.build.toplevel
- name: nix build cherry
run: nix build .#nixosConfigurations.cherry.config.system.build.toplevel
- name: nix build chungus
run: nix build .#nixosConfigurations.chungus.config.system.build.toplevel

View file

@ -2,48 +2,54 @@ name: Update Nix flakes and commit changes
on:
schedule:
- cron: "40 10 * * *" # not to frequent, GitHub only allows a few pulls per hour
- cron: "5/10 * * * *"
jobs:
update-and-commit:
runs-on: native
steps:
- name: checkout repository
uses: actions/checkout@v2
with:
ref: "update"
depth: 0
- name: setup git
run: |
git config --local user.email "action@git.ingolf-wagner.de"
git config --local user.name "Forgejo Action"
# fixme: not working for some reason
#- name: rebase with main branch
# run: |
# git fetch origin main
# git rebase origin/main
- name: update nix flakes
- name: rebase with main branch
run: |
cat <<EOF > .ssh_key
git fetch origin main
git rebase origin/main
- name: setup ssh
run: |
cat <<EOF > .id_rsa
${{ secrets.SSH_KEY }}
EOF
chmod 600 .ssh_key
chmod 600 .id_rsa
eval $(ssh-agent)
ssh-add .ssh_key
ssh-add .id_rsa
nix flake update
cat <<EOF > "$GITHUB_ENV"
SSH_AUTH_SOCK="$SSH_AUTH_SOCK"
SSH_AGENT_PID=$SSH_AGENT_PID
EOF
export GITHUB_TOKEN=""
- name: update nix flakes
run: nix flake update
- name: commit and push changes
run: |
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

@ -121,11 +121,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1721402843,
"narHash": "sha256-/DiRx6TgI/3KcrgO5SAs0FjLz68j7lqp3kf8MbfSCcw=",
"lastModified": 1721526898,
"narHash": "sha256-HFaqhuClCWau5sbxDlNXFtElELSqn7oEgPEt2iW4nkA=",
"owner": "nix-community",
"repo": "buildbot-nix",
"rev": "5bdbb7609689989a79f7d6e6e59c4b7985634230",
"rev": "be581a532080db9f37a9ec8522eca351929fc846",
"type": "github"
},
"original": {
@ -170,11 +170,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1720813949,
"narHash": "sha256-ZqoP7VDuliqGiBo54aYOv5VMjeX+bNaOKCXfDflj+xc=",
"lastModified": 1721508205,
"narHash": "sha256-X4xVtKAkA/gVqIaCw0L5Rk9062VqlHiH0VK5En5Oi5s=",
"owner": "mrvandalo",
"repo": "clan-fact-generators",
"rev": "aa5c71bf46b453233945380b43fac2fc3d256efb",
"rev": "b3fb36c18871861f510330c272b455eb718cd3e4",
"type": "github"
},
"original": {
@ -426,11 +426,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1721135958,
"narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=",
"lastModified": 1721534365,
"narHash": "sha256-XpZOkaSJKdOsz1wU6JfO59Rx2fqtcarQ0y6ndIOKNpI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d",
"rev": "635563f245309ef5320f80c7ebcb89b2398d2949",
"type": "github"
},
"original": {
@ -605,11 +605,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1721215108,
"narHash": "sha256-aOiSBcftoGye0spDdIylZE6TVTo7C/B4atYH25tSemQ=",
"lastModified": 1721481798,
"narHash": "sha256-GOwbtcTDS7KnVseckF+H8OCRNrwYEqCZ34QOZ+i51e4=",
"owner": "Nixos",
"repo": "nixpkgs",
"rev": "7edc243443b44444eba596557de03ee52beca2eb",
"rev": "a2aeb0fcca8ef063c03ef57fa5de49084d4e9687",
"type": "github"
},
"original": {
@ -653,11 +653,11 @@
},
"nixpkgs-legacy_2405": {
"locked": {
"lastModified": 1721226092,
"narHash": "sha256-UBvzVpo5sXSi2S/Av+t+Q+C2mhMIw/LBEZR+d6NMjws=",
"lastModified": 1721409541,
"narHash": "sha256-b6PLr0Ty7JPDBtJtjnYzlBf02bbH9alWMAgispMkTwk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c716603a63aca44f39bef1986c13402167450e0a",
"rev": "0c53b6b8c2a3e46c68e04417e247bba660689c9d",
"type": "github"
},
"original": {
@ -681,11 +681,11 @@
},
"nixpkgs-unstable-small": {
"locked": {
"lastModified": 1721393053,
"narHash": "sha256-xNiw9gIxyF6xsyXCiFESPjxMjuVAfmr4sBpM9u2l5io=",
"lastModified": 1721524691,
"narHash": "sha256-aE4vMfHfpX6KP9VWqVdXtoDUlvFR34wEIjqsqnKrVdY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a0691657e9634cfc001f02995cca394025e3e940",
"rev": "c9ed026def59fe978203a2b28eccdbaa7e5fadc9",
"type": "github"
},
"original": {
@ -713,11 +713,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1719848872,
"narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=",
"lastModified": 1721379653,
"narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8",
"rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374",
"type": "github"
},
"original": {
@ -1033,11 +1033,11 @@
]
},
"locked": {
"lastModified": 1721429336,
"narHash": "sha256-DTJUvI4Xkj4KC5tdq15OEUkPpk7Ebvqcz356dIT6jtY=",
"lastModified": 1721478802,
"narHash": "sha256-+WMQs0fMAmpWPsKNgIFQoKLtvS4qtTj+mC++cD1May4=",
"owner": "danth",
"repo": "stylix",
"rev": "6bbae4f85b891df2e6e48b649919420434088507",
"rev": "6f36b27afd7b7ac8664bb62b7b27728540972c82",
"type": "github"
},
"original": {
@ -1105,11 +1105,11 @@
]
},
"locked": {
"lastModified": 1721059077,
"narHash": "sha256-gCICMMX7VMSKKt99giDDtRLkHJ0cwSgBtDijJAqTlto=",
"lastModified": 1721458737,
"narHash": "sha256-wNXLQ/ATs1S4Opg1PmuNoJ+Wamqj93rgZYV3Di7kxkg=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "0fb28f237f83295b4dd05e342f333b447c097398",
"rev": "888bfb10a9b091d9ed2f5f8064de8d488f7b7c97",
"type": "github"
},
"original": {