From 1c9a9ee26b6e8955eca2753ab7fefdf34031b2a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Thu, 25 Apr 2024 15:44:19 +0200 Subject: [PATCH] fix --- .../tekton.dev_v1beta1_Task_generate-build-id.yaml | 6 +++++- share/gitea-tekton-org/v1_ConfigMap_auto-cd-templates.yaml | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/share/gitea-tekton-org/tekton.dev_v1beta1_Task_generate-build-id.yaml b/share/gitea-tekton-org/tekton.dev_v1beta1_Task_generate-build-id.yaml index 3534792..b252500 100644 --- a/share/gitea-tekton-org/tekton.dev_v1beta1_Task_generate-build-id.yaml +++ b/share/gitea-tekton-org/tekton.dev_v1beta1_Task_generate-build-id.yaml @@ -39,6 +39,7 @@ spec: echo -n ${ts} | tee $(results.timestamp.path) - name: get-commitcount image: $(params.toolbox-image) + workingDir: $(workspaces.source.path) script: | #!/usr/bin/env bash cc=`git rev-list --count HEAD` @@ -52,4 +53,7 @@ spec: cc=`cat $(results.commitcount.path)` buildId="$(params.branch)-${cc}.${ts}" echo -n "Build ID: " - echo -n ${buildId} | tee $(results.build-id.path) \ No newline at end of file + echo -n ${buildId} | tee $(results.build-id.path) + workspaces: + - name: source + description: A workspace that contains the fetched git repository to create a version for. \ No newline at end of file diff --git a/share/gitea-tekton-org/v1_ConfigMap_auto-cd-templates.yaml b/share/gitea-tekton-org/v1_ConfigMap_auto-cd-templates.yaml index d1501c2..0d3e18f 100644 --- a/share/gitea-tekton-org/v1_ConfigMap_auto-cd-templates.yaml +++ b/share/gitea-tekton-org/v1_ConfigMap_auto-cd-templates.yaml @@ -238,7 +238,7 @@ data: imageRepositoryRef: name: ${PROJECT_NAME}-repo filterTags: - pattern: '^v(?P(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)' + pattern: '^v(?P.*)$' extract: '$semver' policy: semver: @@ -256,7 +256,7 @@ data: imageRepositoryRef: name: ${PROJECT_NAME}-repo filterTags: - pattern: '^main-(?P(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)' + pattern: '^main-(?P.*)$' extract: '$semver' policy: semver: