Merge branch 'webhook_bridge'

.lighthouse/triggers.yaml

@@ -1,32 +0,0 @@
-apiVersion: config.lighthouse.jenkins-x.io/v1alpha1
-kind: TriggerConfig
-spec:
-  postsubmits:
-    - name: build
-      source: "pipeline-build.yaml"
-      # Override https-based url from lighthouse events.
-      clone_uri: "git@code.fizz.buzz:talexander/ta_waybar_pipewire.git"
-      branches:
-        - ^main$
-        - ^master$
-    - name: rust-test
-      source: "pipeline-rust-test.yaml"
-      # Override https-based url from lighthouse events.
-      clone_uri: "git@code.fizz.buzz:talexander/ta_waybar_pipewire.git"
-      skip_branches:
-        # We already run on every commit, so running when the semver tags get pushed is causing needless double-processing.
-        - "^v[0-9]+\\.[0-9]+\\.[0-9]+$"
-    - name: rust-clippy
-      source: "pipeline-rust-clippy.yaml"
-      # Override https-based url from lighthouse events.
-      clone_uri: "git@code.fizz.buzz:talexander/ta_waybar_pipewire.git"
-      skip_branches:
-        # We already run on every commit, so running when the semver tags get pushed is causing needless double-processing.
-        - "^v[0-9]+\\.[0-9]+\\.[0-9]+$"
-    - name: format
-      source: "pipeline-format.yaml"
-      # Override https-based url from lighthouse events.
-      clone_uri: "git@code.fizz.buzz:talexander/ta_waybar_pipewire.git"
-      skip_branches:
-        # We already run on every commit, so running when the semver tags get pushed is causing needless double-processing.
-        - "^v[0-9]+\\.[0-9]+\\.[0-9]+$"

.webhook_bridge/pipeline-build-hash.yaml

@@ -1,17 +1,22 @@
-apiVersion: tekton.dev/v1beta1
+apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
   name: build
 spec:
+  timeouts:
+    pipeline: "2h0m0s"
+    tasks: "1h0m0s"
+    finally: "0h30m0s"
+  taskRunTemplate:
+    serviceAccountName: build-bot
   pipelineSpec:
-    timeouts:
-      pipeline: "2h0m0s"
-      tasks: "1h0m0s"
-      finally: "0h30m0s"
     params:
       - name: image-name
         description: The name for the built image
         type: string
+      - name: target-name
+        description: The dockerfile target to build
+        type: string
       - name: path-to-image-context
         description: The path to the build context
         type: string
@@ -24,13 +29,11 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://github.com/tektoncd/catalog.git
+              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
               value: task/gitea-set-status/0.1/gitea-set-status.yaml
-        runAfter:
-          - fetch-repository
         params:
           - name: CONTEXT
             value: "$(params.JOB_NAME)"
@@ -51,7 +54,7 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://github.com/tektoncd/catalog.git
+              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -66,12 +69,12 @@ spec:
             value: $(params.PULL_BASE_SHA)
           - name: deleteExisting
             value: "true"
-      - name: build-image-runner
+      - name: build-image
         taskRef:
           resolver: git
           params:
             - name: url
-              value: https://github.com/tektoncd/catalog.git
+              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -88,6 +91,7 @@ spec:
           - name: EXTRA_ARGS
             value:
               - "--destination=$(params.image-name)" # Also write the :latest image
+              - "--target=$(params.target-name)"
               - --cache=true
               - --cache-copy-layers
               - --cache-repo=harbor.fizz.buzz/kanikocache/cache
@@ -101,8 +105,6 @@ spec:
             workspace: git-source
           - name: dockerconfig
             workspace: docker-credentials
-        runAfter:
-          - fetch-repository
     finally:
       - name: report-success
         when:
@@ -113,7 +115,7 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://github.com/tektoncd/catalog.git
+              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -142,7 +144,7 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://github.com/tektoncd/catalog.git
+              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -179,11 +181,11 @@ spec:
     - name: docker-credentials
       secret:
         secretName: harbor-plain
-  serviceAccountName: build-bot
-  timeout: 240h0m0s
   params:
     - name: image-name
       value: "harbor.fizz.buzz/private/ta-waybar-pipewire"
+    - name: target-name
+      value: ""
     - name: path-to-image-context
       value: .
     - name: path-to-dockerfile

.webhook_bridge/pipeline-format.yaml

@@ -1,17 +1,22 @@
-apiVersion: tekton.dev/v1beta1
+apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
   name: rust-format
 spec:
+  timeouts:
+    pipeline: "2h0m0s"
+    tasks: "1h0m0s"
+    finally: "0h30m0s"
+  taskRunTemplate:
+    serviceAccountName: build-bot
   pipelineSpec:
-    timeouts:
-      pipeline: "2h0m0s"
-      tasks: "1h0m0s"
-      finally: "0h30m0s"
     params:
       - name: image-name
         description: The name for the built image
         type: string
+      - name: target-name
+        description: The dockerfile target to build
+        type: string
       - name: path-to-image-context
         description: The path to the build context
         type: string
@@ -24,13 +29,11 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://github.com/tektoncd/catalog.git
+              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
               value: task/gitea-set-status/0.1/gitea-set-status.yaml
-        runAfter:
-          - fetch-repository
         params:
           - name: CONTEXT
             value: "$(params.JOB_NAME)"
@@ -51,7 +54,7 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://github.com/tektoncd/catalog.git
+              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -71,7 +74,7 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://github.com/tektoncd/catalog.git
+              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -87,6 +90,7 @@ spec:
             value: "gcr.io/kaniko-project/executor:v1.12.1"
           - name: EXTRA_ARGS
             value:
+              - "--target=$(params.target-name)"
               - --cache=true
               - --cache-copy-layers
               - --cache-repo=harbor.fizz.buzz/kanikocache/cache
@@ -100,8 +104,6 @@ spec:
             workspace: git-source
           - name: dockerconfig
             workspace: docker-credentials
-        runAfter:
-          - fetch-repository
       - name: run-cargo-fmt
         taskSpec:
           metadata: {}
@@ -109,11 +111,10 @@ spec:
             - name: docker-image
               type: string
               description: Docker image to run.
-              default: alpine:3.19
+              default: alpine:3.20
           stepTemplate:
-            image: alpine:3.19
-            name: ""
-            resources:
+            image: alpine:3.20
+            computeResources:
               requests:
                 cpu: 10m
                 memory: 600Mi
@@ -148,7 +149,7 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://github.com/tektoncd/catalog.git
+              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -184,7 +185,7 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://github.com/tektoncd/catalog.git
+              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -213,7 +214,7 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://github.com/tektoncd/catalog.git
+              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -240,11 +241,10 @@ spec:
             - name: docker-image
               type: string
               description: Docker image to run.
-              default: alpine:3.19
+              default: alpine:3.20
           stepTemplate:
-            image: alpine:3.19
-            name: ""
-            resources:
+            image: alpine:3.20
+            computeResources:
               requests:
                 cpu: 10m
                 memory: 600Mi
@@ -290,10 +290,11 @@ spec:
     - name: docker-credentials
       secret:
         secretName: harbor-plain
-  serviceAccountName: build-bot
   params:
     - name: image-name
-      value: "harbor.fizz.buzz/private/ta-waybar-pipewire-development"
+      value: "harbor.fizz.buzz/private/ta-waybar-pipewire-development-format"
+    - name: target-name
+      value: ""
     - name: path-to-image-context
       value: docker/ta_waybar_pipewire_development/
     - name: path-to-dockerfile

.webhook_bridge/pipeline-rust-clippy.yaml

@@ -1,17 +1,22 @@
-apiVersion: tekton.dev/v1beta1
+apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
   name: rust-clippy
 spec:
+  taskRunTemplate:
+    serviceAccountName: build-bot
+  timeouts:
+    pipeline: "2h0m0s"
+    tasks: "1h0m40s"
+    finally: "0h30m0s"
   pipelineSpec:
-    timeouts:
-      pipeline: "2h0m0s"
-      tasks: "1h0m40s"
-      finally: "0h30m0s"
     params:
       - name: image-name
         description: The name for the built image
         type: string
+      - name: target-name
+        description: The dockerfile target to build
+        type: string
       - name: path-to-image-context
         description: The path to the build context
         type: string
@@ -24,13 +29,11 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://github.com/tektoncd/catalog.git
+              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
               value: task/gitea-set-status/0.1/gitea-set-status.yaml
-        runAfter:
-          - fetch-repository
         params:
           - name: CONTEXT
             value: "$(params.JOB_NAME)"
@@ -51,7 +54,7 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://github.com/tektoncd/catalog.git
+              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -71,7 +74,7 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://github.com/tektoncd/catalog.git
+              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -87,6 +90,7 @@ spec:
             value: "gcr.io/kaniko-project/executor:v1.12.1"
           - name: EXTRA_ARGS
             value:
+              - "--target=$(params.target-name)"
               - --cache=true
               - --cache-copy-layers
               - --cache-repo=harbor.fizz.buzz/kanikocache/cache
@@ -100,8 +104,6 @@ spec:
             workspace: git-source
           - name: dockerconfig
             workspace: docker-credentials
-        runAfter:
-          - fetch-repository
       - name: run-cargo-clippy
         taskSpec:
           metadata: {}
@@ -109,11 +111,10 @@ spec:
             - name: docker-image
               type: string
               description: Docker image to run.
-              default: alpine:3.19
+              default: alpine:3.20
           stepTemplate:
-            image: alpine:3.19
-            name: ""
-            resources:
+            image: alpine:3.20
+            computeResources:
               requests:
                 cpu: 10m
                 memory: 600Mi
@@ -163,7 +164,7 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://github.com/tektoncd/catalog.git
+              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -192,7 +193,7 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://github.com/tektoncd/catalog.git
+              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -219,11 +220,10 @@ spec:
             - name: docker-image
               type: string
               description: Docker image to run.
-              default: alpine:3.19
+              default: alpine:3.20
           stepTemplate:
-            image: alpine:3.19
-            name: ""
-            resources:
+            image: alpine:3.20
+            computeResources:
               requests:
                 cpu: 10m
                 memory: 600Mi
@@ -269,10 +269,11 @@ spec:
     - name: docker-credentials
       secret:
         secretName: harbor-plain
-  serviceAccountName: build-bot
   params:
     - name: image-name
-      value: "harbor.fizz.buzz/private/ta-waybar-pipewire-development"
+      value: "harbor.fizz.buzz/private/ta-waybar-pipewire-development-clippy"
+    - name: target-name
+      value: ""
     - name: path-to-image-context
       value: docker/ta_waybar_pipewire_development/
     - name: path-to-dockerfile

.webhook_bridge/pipeline-rust-test.yaml

@@ -1,17 +1,22 @@
-apiVersion: tekton.dev/v1beta1
+apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
   name: rust-test
 spec:
+  timeouts:
+    pipeline: "2h0m0s"
+    tasks: "1h0m40s"
+    finally: "0h30m0s"
+  taskRunTemplate:
+    serviceAccountName: build-bot
   pipelineSpec:
-    timeouts:
-      pipeline: "2h0m0s"
-      tasks: "1h0m40s"
-      finally: "0h30m0s"
     params:
       - name: image-name
         description: The name for the built image
         type: string
+      - name: target-name
+        description: The dockerfile target to build
+        type: string
       - name: path-to-image-context
         description: The path to the build context
         type: string
@@ -24,13 +29,11 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://github.com/tektoncd/catalog.git
+              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
               value: task/gitea-set-status/0.1/gitea-set-status.yaml
-        runAfter:
-          - fetch-repository
         params:
           - name: CONTEXT
             value: "$(params.JOB_NAME)"
@@ -51,7 +54,7 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://github.com/tektoncd/catalog.git
+              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -71,11 +74,11 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://github.com/tektoncd/catalog.git
+              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
-              value: task/kaniko/0.6//kaniko.yaml
+              value: task/kaniko/0.6/kaniko.yaml
         params:
           - name: IMAGE
             value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
@@ -87,6 +90,7 @@ spec:
             value: "gcr.io/kaniko-project/executor:v1.12.1"
           - name: EXTRA_ARGS
             value:
+              - "--target=$(params.target-name)"
               - --cache=true
               - --cache-copy-layers
               - --cache-repo=harbor.fizz.buzz/kanikocache/cache
@@ -100,8 +104,6 @@ spec:
             workspace: git-source
           - name: dockerconfig
             workspace: docker-credentials
-        runAfter:
-          - fetch-repository
       - name: run-cargo-test
         taskSpec:
           metadata: {}
@@ -109,11 +111,10 @@ spec:
             - name: docker-image
               type: string
               description: Docker image to run.
-              default: alpine:3.19
+              default: alpine:3.20
           stepTemplate:
-            image: alpine:3.19
-            name: ""
-            resources:
+            image: alpine:3.20
+            computeResources:
               requests:
                 cpu: 10m
                 memory: 600Mi
@@ -153,7 +154,7 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://github.com/tektoncd/catalog.git
+              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -182,7 +183,7 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://github.com/tektoncd/catalog.git
+              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -209,11 +210,10 @@ spec:
             - name: docker-image
               type: string
               description: Docker image to run.
-              default: alpine:3.19
+              default: alpine:3.20
           stepTemplate:
-            image: alpine:3.19
-            name: ""
-            resources:
+            image: alpine:3.20
+            computeResources:
               requests:
                 cpu: 10m
                 memory: 600Mi
@@ -259,10 +259,11 @@ spec:
     - name: docker-credentials
       secret:
         secretName: harbor-plain
-  serviceAccountName: build-bot
   params:
     - name: image-name
-      value: "harbor.fizz.buzz/private/ta-waybar-pipewire-development"
+      value: "harbor.fizz.buzz/private/ta-waybar-pipewire-development-test"
+    - name: target-name
+      value: ""
     - name: path-to-image-context
       value: docker/ta_waybar_pipewire_development/
     - name: path-to-dockerfile

.webhook_bridge/webhook_bridge.toml

@@ -0,0 +1,25 @@
+version = "0.0.1"
+
+[[push]]
+  name = "rust-test"
+  source = "pipeline-rust-test.yaml"
+  clone_uri = "git@code.fizz.buzz:talexander/ta_waybar_pipewire.git"
+  skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ]
+
+[[push]]
+  name = "clippy"
+  source = "pipeline-rust-clippy.yaml"
+  clone_uri = "git@code.fizz.buzz:talexander/ta_waybar_pipewire.git"
+  skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ]
+
+[[push]]
+  name = "format"
+  source = "pipeline-format.yaml"
+  clone_uri = "git@code.fizz.buzz:talexander/ta_waybar_pipewire.git"
+  skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ]
+
+[[push]]
+  name = "build"
+  source = "pipeline-build-hash.yaml"
+  clone_uri = "git@code.fizz.buzz:talexander/ta_waybar_pipewire.git"
+  branches = [ "^main$", "^master$" ]

docker/ta_waybar_pipewire/Dockerfile

@@ -1,4 +1,4 @@
-FROM rustlang/rust:nightly-alpine3.19 AS builder
+FROM rustlang/rust:nightly-alpine3.20 AS builder
 
 RUN apk add --no-cache musl-dev pkgconf pipewire-dev clang-dev
 
@@ -8,6 +8,6 @@ COPY . .
 # TODO: Add static build, which currently errors due to proc_macro. RUSTFLAGS="-C target-feature=+crt-static"
 RUN CARGO_TARGET_DIR=/target cargo build --profile release-lto
 
-FROM alpine:3.19 AS runner
+FROM alpine:3.20 AS runner
 
 COPY --from=builder /target/release-lto/ta_waybar_pipewire /usr/bin/

docker/ta_waybar_pipewire_development/Dockerfile

@@ -1,4 +1,4 @@
-FROM rustlang/rust:nightly-alpine3.19 AS builder
+FROM rustlang/rust:nightly-alpine3.20 AS builder
 
 RUN apk add --no-cache musl-dev pkgconf pipewire-dev clang-dev
 RUN cargo install --locked --no-default-features --features ci-autoclean cargo-cache