From 2d1c9e29311b6f49f5131059e916ad1a1aa2dccc Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Fri, 17 Jul 2026 19:55:50 -0400 Subject: [PATCH] fixup! Add support for building the site via nix. --- .../pipeline-build-homepage-staging.yaml | 24 +++++++++---------- .webhook_bridge/pipeline-build-homepage.yaml | 4 +++- flake.lock | 24 +++++++++---------- 3 files changed, 27 insertions(+), 25 deletions(-) diff --git a/.webhook_bridge/pipeline-build-homepage-staging.yaml b/.webhook_bridge/pipeline-build-homepage-staging.yaml index 526c7f4..82e9ec5 100644 --- a/.webhook_bridge/pipeline-build-homepage-staging.yaml +++ b/.webhook_bridge/pipeline-build-homepage-staging.yaml @@ -70,18 +70,6 @@ spec: - name: TARGET_URL value: "https://tekton.fizz.buzz/#/namespaces/$(context.pipelineRun.namespace)/pipelineruns/$(context.pipelineRun.name)" - name: fetch-repository - taskRef: - resolver: git - params: - - name: url - value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git - - name: revision - value: f914437a46978b95f325f68d791dcf1a35738f60 - - name: pathInRepo - value: task/git-clone/0.9/git-clone.yaml - workspaces: - - name: output - workspace: git-source params: - name: url value: $(params.REPO_URL) @@ -89,6 +77,18 @@ spec: value: $(params.PULL_BASE_SHA) - name: deleteExisting value: "true" + taskRef: + params: + - name: url + value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git + - name: revision + value: "dda7b690195b43e8b9859d1caf5dcbf48588ade1" + - name: pathInRepo + value: task/git-clone/0.1/git-clone.yaml + resolver: git + workspaces: + - name: output + workspace: git-source - name: get-git-commit-time taskSpec: metadata: {} diff --git a/.webhook_bridge/pipeline-build-homepage.yaml b/.webhook_bridge/pipeline-build-homepage.yaml index b74d781..2148cca 100644 --- a/.webhook_bridge/pipeline-build-homepage.yaml +++ b/.webhook_bridge/pipeline-build-homepage.yaml @@ -135,7 +135,7 @@ spec: - name: url value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git - name: revision - value: 7d4b33528fef5f2e662d32d093566ce56eb4acd0 + value: dda7b690195b43e8b9859d1caf5dcbf48588ade1 - name: pathInRepo value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml params: @@ -156,6 +156,8 @@ spec: - "type=registry,ref=$(params.image-name):buildcache,mode=max,compression=zstd,compression-level=22,rewrite-timestamp=true,image-manifest=true,oci-mediatypes=true" - --opt - build-arg:SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time) + - --opt + - "build-arg:NIX_SUBSTITUTERS=http://ncps.nix-pull-through-cache.svc.cluster.local:80 https://cache.nixos.org" - name: BUILDKITD_TOML value: | debug = true diff --git a/flake.lock b/flake.lock index 8568bef..bff5843 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1783808400, - "narHash": "sha256-izeK0soRWiep4mkZ1duD1hf3fqXYrZXsHUwnBzTbTpA=", + "lastModified": 1784331935, + "narHash": "sha256-4t+8v+9oTTfCKSvXmlej44EEigJPxnQZSUSYUwBov04=", "ref": "refs/heads/main", - "rev": "05c7ecde829f3e3843e89000e9959b8016124b2e", - "revCount": 326, + "rev": "46dd4086592d12d44467810367a6d0d0b265a91e", + "revCount": 327, "type": "git", "url": "https://code.fizz.buzz/talexander/natter.git" }, @@ -46,11 +46,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1783734912, - "narHash": "sha256-tXPapMwegdfP0jcr3BPQXxv1Aauo6yZwS4q2sIKOF9o=", + "lastModified": 1784327891, + "narHash": "sha256-kGmXbmpkkiD2FtX7vKNdbL6/p/fvQ9OT2iS/ve55V5I=", "ref": "refs/heads/main", - "rev": "842a77fb2bc684a545fb102e16790fa902aec11c", - "revCount": 2008, + "rev": "336b5d3d5444ad847cd5fbf1490055e733911b57", + "revCount": 2010, "type": "git", "url": "https://code.fizz.buzz/talexander/organic.git" }, @@ -67,11 +67,11 @@ "organic": "organic" }, "locked": { - "lastModified": 1783737126, - "narHash": "sha256-BM6lYBegCV8EkVGqd6wIW9YN4EQL8cnoe4T5TuV7Q2I=", + "lastModified": 1784331571, + "narHash": "sha256-0AeEsziAEjL/lgrlTu7RvOoylV1hSozo04rfc3Y7q6M=", "ref": "refs/heads/main", - "rev": "de11bc7c5e08610dc006ac7b31454abc6e1f46e7", - "revCount": 74, + "rev": "55b239a3fe0b7a3b70f392be36b9efd49848be03", + "revCount": 75, "type": "git", "url": "https://code.fizz.buzz/talexander/organic_ast_explorer.git" },