From 29b7be20d4871b0ebac2db7c1691ecd3e690283f Mon Sep 17 00:00:00 2001 From: rasmus-kirk Date: Mon, 10 Mar 2025 09:50:53 +0100 Subject: [PATCH] Fixed CI --- .github/workflows/deployment.yml | 17 +++++++---------- flake.nix | 25 ------------------------- 2 files changed, 7 insertions(+), 35 deletions(-) diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 1cc06ad..63bdf26 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -20,7 +20,7 @@ concurrency: cancel-in-progress: false jobs: - generate-doc-options: + run-nix-build: runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v3 @@ -40,16 +40,13 @@ jobs: name: website path: ./out - deploy-docs: - needs: generate-doc-options + deploy-site: + needs: run-nix-build environment: name: github-pages url: ${{ steps.deployment.outputs.page_url }} runs-on: ubuntu-24.04 steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Get nix build output uses: actions/download-artifact@v4 with: @@ -57,13 +54,13 @@ jobs: path: './out' - name: Setup Pages - uses: actions/configure-pages@v3 + uses: actions/configure-pages@v5 - - name: Upload GH pages artifact - uses: actions/upload-pages-artifact@v1 + - name: Upload artifact + uses: actions/upload-pages-artifact@v3 with: path: './out' - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v2 + uses: actions/deploy-pages@v4 diff --git a/flake.nix b/flake.nix index 57a4b51..242df3d 100644 --- a/flake.nix +++ b/flake.nix @@ -100,31 +100,6 @@ in { default = website.package; debug = website.loop; - testPkg = pkgs.stdenv.mkDerivation { - name = "test-pkg"; - src = ./.; - buildInputs = [( - pkgs.writeShellApplication { - name = "test-pkg-builder"; - - runtimeInputs = with pkgs; [ - pandoc - coreutils - findutils - gnused - rsync - git - ]; - - text = '' - echo "${self.lastModified}" - ''; - } - )]; - phases = ["unpackPhase" "buildPhase"]; - buildPhase = "test-pkg-builder"; - }; - }); formatter = forAllSystems ({pkgs}: pkgs.alejandra);