From ad5bd0ac0e4993cbe4005d6281558e963b222371 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Fri, 10 Jul 2026 23:22:55 -0400 Subject: [PATCH] Fix tekton pipelines. --- .webhook_bridge/pipeline-build-hash.yaml | 26 ++++++++--------- .webhook_bridge/pipeline-format.yaml | 31 +++++++++++--------- .webhook_bridge/pipeline-rust-clippy.yaml | 31 +++++++++++--------- .webhook_bridge/pipeline-rust-test.yaml | 35 +++++++++++++---------- docker/natter/Dockerfile | 10 ++++--- rust-toolchain.toml | 2 +- 6 files changed, 76 insertions(+), 59 deletions(-) diff --git a/.webhook_bridge/pipeline-build-hash.yaml b/.webhook_bridge/pipeline-build-hash.yaml index 7211318..4a09b96 100644 --- a/.webhook_bridge/pipeline-build-hash.yaml +++ b/.webhook_bridge/pipeline-build-hash.yaml @@ -50,18 +50,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: df36b3853a5657fd883015cdbf07ad6466918acf - - name: pathInRepo - value: task/git-clone/0.9/git-clone.yaml - workspaces: - - name: output - workspace: git-source params: - name: url value: $(params.REPO_URL) @@ -69,6 +57,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: "31376f29c6332ea8c378152d5ccda1ba9dbcd7bb" + - 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: {} @@ -101,7 +101,7 @@ spec: - name: url value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git - name: revision - value: 7ee31a185243ee6da13dcd26a592c585b64c80e5 + value: 31376f29c6332ea8c378152d5ccda1ba9dbcd7bb - name: pathInRepo value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml params: diff --git a/.webhook_bridge/pipeline-format.yaml b/.webhook_bridge/pipeline-format.yaml index 3ae2204..cb9ec51 100644 --- a/.webhook_bridge/pipeline-format.yaml +++ b/.webhook_bridge/pipeline-format.yaml @@ -50,18 +50,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: df36b3853a5657fd883015cdbf07ad6466918acf - - name: pathInRepo - value: task/git-clone/0.9/git-clone.yaml - workspaces: - - name: output - workspace: git-source params: - name: url value: $(params.REPO_URL) @@ -69,6 +57,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: "31376f29c6332ea8c378152d5ccda1ba9dbcd7bb" + - 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: {} @@ -101,7 +101,7 @@ spec: - name: url value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git - name: revision - value: 7ee31a185243ee6da13dcd26a592c585b64c80e5 + value: 31376f29c6332ea8c378152d5ccda1ba9dbcd7bb - name: pathInRepo value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml params: @@ -167,6 +167,8 @@ spec: env: - name: CARGO_TARGET_DIR value: /target + - name: RUSTUP_PERMIT_COPY_RENAME + value: "true" workspaces: - name: source workspace: git-source @@ -329,6 +331,9 @@ spec: workingDir: "$(workspaces.source.path)" command: [cargo, cache, --autoclean] args: [] + env: + - name: RUSTUP_PERMIT_COPY_RENAME + value: "true" workspaces: - name: source workspace: git-source diff --git a/.webhook_bridge/pipeline-rust-clippy.yaml b/.webhook_bridge/pipeline-rust-clippy.yaml index e3087e0..e09f431 100644 --- a/.webhook_bridge/pipeline-rust-clippy.yaml +++ b/.webhook_bridge/pipeline-rust-clippy.yaml @@ -50,18 +50,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: df36b3853a5657fd883015cdbf07ad6466918acf - - name: pathInRepo - value: task/git-clone/0.9/git-clone.yaml - workspaces: - - name: output - workspace: git-source params: - name: url value: $(params.REPO_URL) @@ -69,6 +57,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: "31376f29c6332ea8c378152d5ccda1ba9dbcd7bb" + - 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: {} @@ -101,7 +101,7 @@ spec: - name: url value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git - name: revision - value: 7ee31a185243ee6da13dcd26a592c585b64c80e5 + value: 31376f29c6332ea8c378152d5ccda1ba9dbcd7bb - name: pathInRepo value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml params: @@ -177,6 +177,8 @@ spec: env: - name: CARGO_TARGET_DIR value: /target + - name: RUSTUP_PERMIT_COPY_RENAME + value: "true" workspaces: - name: source workspace: git-source @@ -273,6 +275,9 @@ spec: workingDir: "$(workspaces.source.path)" command: [cargo, cache, --autoclean] args: [] + env: + - name: RUSTUP_PERMIT_COPY_RENAME + value: "true" workspaces: - name: source workspace: git-source diff --git a/.webhook_bridge/pipeline-rust-test.yaml b/.webhook_bridge/pipeline-rust-test.yaml index f6dedc7..6abce78 100644 --- a/.webhook_bridge/pipeline-rust-test.yaml +++ b/.webhook_bridge/pipeline-rust-test.yaml @@ -50,18 +50,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: df36b3853a5657fd883015cdbf07ad6466918acf - - name: pathInRepo - value: task/git-clone/0.9/git-clone.yaml - workspaces: - - name: output - workspace: git-source params: - name: url value: $(params.REPO_URL) @@ -69,6 +57,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: "31376f29c6332ea8c378152d5ccda1ba9dbcd7bb" + - 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: {} @@ -101,7 +101,7 @@ spec: - name: url value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git - name: revision - value: 7ee31a185243ee6da13dcd26a592c585b64c80e5 + value: 31376f29c6332ea8c378152d5ccda1ba9dbcd7bb - name: pathInRepo value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml params: @@ -162,11 +162,13 @@ spec: - name: run image: $(params.docker-image) workingDir: "$(workspaces.source.path)" - command: [cargo, test, --no-fail-fast] - args: [] + command: [cargo, test] + args: [--no-fail-fast] env: - name: CARGO_TARGET_DIR value: /target + - name: RUSTUP_PERMIT_COPY_RENAME + value: "true" workspaces: - name: source workspace: git-source @@ -263,6 +265,9 @@ spec: workingDir: "$(workspaces.source.path)" command: [cargo, cache, --autoclean] args: [] + env: + - name: RUSTUP_PERMIT_COPY_RENAME + value: "true" workspaces: - name: source workspace: git-source diff --git a/docker/natter/Dockerfile b/docker/natter/Dockerfile index 7c041fc..b7edabe 100644 --- a/docker/natter/Dockerfile +++ b/docker/natter/Dockerfile @@ -1,7 +1,8 @@ # syntax=docker/dockerfile:1 -ARG ALPINE_VERSION="3.20" +ARG ALPINE_VERSION="3.24" +ARG RUST_NIGHTLY_VERSION="2026-07-11" -FROM rustlang/rust:nightly-alpine$ALPINE_VERSION AS builder +FROM rustlang/rust:nightly-alpine$ALPINE_VERSION-$RUST_NIGHTLY_VERSION AS builder RUN apk add --no-cache musl-dev @@ -9,8 +10,9 @@ RUN mkdir /root/natter WORKDIR /root/natter COPY --link . . # TODO: Add static build, which currently errors due to proc_macro. RUSTFLAGS="-C target-feature=+crt-static" -RUN --mount=type=tmpfs,target=/tmp --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked CARGO_TARGET_DIR=/target cargo build --profile release-lto +ENV RUSTUP_PERMIT_COPY_RENAME="true" +RUN --mount=type=tmpfs,target=/tmp --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked CARGO_TARGET_DIR=/target mkdir /target && cargo build --profile lto FROM alpine:$ALPINE_VERSION AS runner -COPY --link --from=builder /target/release-lto/natter /usr/bin/ +COPY --link --from=builder /target/lto/natter /usr/bin/ diff --git a/rust-toolchain.toml b/rust-toolchain.toml index a5f9492..740777c 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "nightly" +channel = "nightly-2026-07-11" profile = "default" components = ["clippy", "rustfmt"]