From 6dd53d17f14fcd2891f1ab0e39bb58c81cec2c8f Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Wed, 4 Mar 2026 01:12:08 +0100 Subject: [PATCH 1/2] Revert "workflows/ci: Only build hosts if the derivation differs from previous run" This reverts commit 3206c83d4b690949c3d98f2ea5153b8df04bf0e8. The derivation also differs when any part of the flake changes --- .github/workflows/ci.yml | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4319ce0..0b7cfd0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,46 +60,15 @@ jobs: server: ${{ fromJson(needs.parse-flake.outputs.servers) }} steps: - uses: actions/checkout@v5 - with: - fetch-depth: 0 - uses: cachix/install-nix-action@v31 with: extra_nix_config: experimental-features = nix-command flakes pipe-operators - - name: Check if build can be skipped - id: skip-check - env: - GH_TOKEN: ${{ github.token }} - run: | - last_sha=$(gh api \ - "repos/${{ github.repository }}/actions/workflows/ci.yml/runs?branch=main&status=success&per_page=1" \ - --jq '.workflow_runs[0].head_sha // empty') - - if [[ -z "$last_sha" ]]; then - echo "No previous successful run found, build required" - echo "skip=false" >> "$GITHUB_OUTPUT" - exit 0 - fi - - echo "Comparing current (${{ github.sha }}) with last successful ($last_sha)" - - current_drv=$(nix eval .#nixosConfigurations.${{ matrix.server }}.config.system.build.toplevel.drvPath --raw) - previous_drv=$(nix eval "git+file://$(pwd)?rev=$last_sha#nixosConfigurations.${{ matrix.server }}.config.system.build.toplevel.drvPath" --raw) - - if [[ "$current_drv" == "$previous_drv" ]]; then - echo "Derivations match, skipping build" - echo "skip=true" >> "$GITHUB_OUTPUT" - else - echo "Derivations differ, build required" - echo "skip=false" >> "$GITHUB_OUTPUT" - fi - uses: cachix/cachix-action@v15 - if: steps.skip-check.outputs.skip != 'true' with: name: sebastian-stork authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" useDaemon: false - name: Build server - if: steps.skip-check.outputs.skip != 'true' run: nix build .#nixosConfigurations.${{ matrix.server }}.config.system.build.toplevel --print-build-logs deploy: needs: [build-check, build-server] From 97b64f459ea5e589c2eb27769332f6f32ae5fa83 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Mar 2026 05:08:00 +0000 Subject: [PATCH 2/2] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'firefox-addons': 'gitlab:rycee/nur-expressions/701de032cc247a1c309a34f0ed646e824efd7ac6?dir=pkgs/firefox-addons&narHash=sha256-mhv7yclJj%2BqCagNv0WOuob5yQNV1aTqKcJLfBMUqsVA%3D' (2026-03-02) → 'gitlab:rycee/nur-expressions/cd2d0893966c0a5c27345a9a72d0418b42b7e36d?dir=pkgs/firefox-addons&narHash=sha256-awJJ4ATy9t8Svrx2z0zAftgXnUaGCFb2Ty0u036CnCQ%3D' (2026-03-04) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/1267bb4920d0fc06ea916734c11b0bf004bbe17e?narHash=sha256-7DaQVv4R97cii/Qdfy4tmDZMB2xxtyIvNGSwXBBhSmo%3D' (2026-02-25) → 'github:nixos/nixpkgs/c581273b8d5bdf1c6ce7e0a54da9841e6a763913?narHash=sha256-ywy9troNEfpgh0Ee%2BzaV1UTgU8kYBVKtvPSxh6clYGU%3D' (2026-03-02) • Updated input 'nixpkgs-unstable': 'github:nixos/nixpkgs/dd9b079222d43e1943b6ebd802f04fd959dc8e61?narHash=sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE%3D' (2026-02-27) → 'github:nixos/nixpkgs/8c809a146a140c5c8806f13399592dbcb1bb5dc4?narHash=sha256-WGV2hy%2BVIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg%3D' (2026-03-03) • Updated input 'sops': 'github:Mic92/sops-nix/d8be5ea4cd3bc363492ab5bc6e874ccdc5465fe4?narHash=sha256-YHykQg0h9hrlZGpMcywnaFzQ1Kn/5YNCCOSaaAl6z7Q%3D' (2026-03-01) → 'github:Mic92/sops-nix/1d9b98a29a45abe9c4d3174bd36de9f28755e3ff?narHash=sha256-hmIvE/slLKEFKNEJz27IZ8BKlAaZDcjIHmkZ7GCEjfw%3D' (2026-03-02) • Updated input 'vscode-extensions': 'github:nix-community/nix-vscode-extensions/96e284c58556366535781d9a476121b2b5e839f1?narHash=sha256-%2BIjvRKrbSQX9/ikWy1ptPJBqG%2BRildNl7Cd9yypyzU0%3D' (2026-03-02) → 'github:nix-community/nix-vscode-extensions/94cfd7508800655275c5b2431ba6ca4788552069?narHash=sha256-945zZWaHJ8BfnL%2B49GzmKSNOY1SmD/XZnra8B2zfFPM%3D' (2026-03-04) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 0a303c5..7e15d35 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1772424169, - "narHash": "sha256-mhv7yclJj+qCagNv0WOuob5yQNV1aTqKcJLfBMUqsVA=", + "lastModified": 1772596991, + "narHash": "sha256-awJJ4ATy9t8Svrx2z0zAftgXnUaGCFb2Ty0u036CnCQ=", "owner": "rycee", "repo": "nur-expressions", - "rev": "701de032cc247a1c309a34f0ed646e824efd7ac6", + "rev": "cd2d0893966c0a5c27345a9a72d0418b42b7e36d", "type": "gitlab" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1772198003, - "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", + "lastModified": 1772542754, + "narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", + "rev": "8c809a146a140c5c8806f13399592dbcb1bb5dc4", "type": "github" }, "original": { @@ -260,11 +260,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1772047000, - "narHash": "sha256-7DaQVv4R97cii/Qdfy4tmDZMB2xxtyIvNGSwXBBhSmo=", + "lastModified": 1772465433, + "narHash": "sha256-ywy9troNEfpgh0Ee+zaV1UTgU8kYBVKtvPSxh6clYGU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1267bb4920d0fc06ea916734c11b0bf004bbe17e", + "rev": "c581273b8d5bdf1c6ce7e0a54da9841e6a763913", "type": "github" }, "original": { @@ -317,11 +317,11 @@ ] }, "locked": { - "lastModified": 1772401007, - "narHash": "sha256-YHykQg0h9hrlZGpMcywnaFzQ1Kn/5YNCCOSaaAl6z7Q=", + "lastModified": 1772495394, + "narHash": "sha256-hmIvE/slLKEFKNEJz27IZ8BKlAaZDcjIHmkZ7GCEjfw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d8be5ea4cd3bc363492ab5bc6e874ccdc5465fe4", + "rev": "1d9b98a29a45abe9c4d3174bd36de9f28755e3ff", "type": "github" }, "original": { @@ -397,11 +397,11 @@ ] }, "locked": { - "lastModified": 1772419365, - "narHash": "sha256-+IjvRKrbSQX9/ikWy1ptPJBqG+RildNl7Cd9yypyzU0=", + "lastModified": 1772592001, + "narHash": "sha256-945zZWaHJ8BfnL+49GzmKSNOY1SmD/XZnra8B2zfFPM=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "96e284c58556366535781d9a476121b2b5e839f1", + "rev": "94cfd7508800655275c5b2431ba6ca4788552069", "type": "github" }, "original": {