fix-dirty-tag

securesign · Oct 1, 2024 · bcb327e · bcb327e
1 parent a5dde38
commit bcb327e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/.tekton/client-server-pull-request.yaml b/.tekton/client-server-pull-request.yaml
@@ -7,8 +7,7 @@ metadata:
     build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "main"
+    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main" && ( "Dockerfile.clients.rh".pathChanged() || ".tekton/client-server-pull-request.yaml".pathChanged() || "trigger-konflux-builds.txt".pathChanged() )
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: cli

diff --git a/.tekton/client-server-push.yaml b/.tekton/client-server-push.yaml
@@ -6,8 +6,7 @@ metadata:
     build.appstudio.redhat.com/commit_sha: '{{revision}}'
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
-      == "main"
+    pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "main" && ( "Dockerfile.clients.rh".pathChanged() || ".tekton/client-server-push.yaml".pathChanged() || "trigger-konflux-builds.txt".pathChanged() )
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: cli

diff --git a/Dockerfile.cosign.rh b/Dockerfile.cosign.rh
@@ -5,12 +5,12 @@ WORKDIR /cosign
 COPY . .
 USER root
 RUN git config --global --add safe.directory /cosign && \
-    # git stash && \
+    go mod vendor && \
+    git stash -u && \
     export GIT_VERSION=$(git describe --tags --always --dirty) && \
     export GIT_HASH=$(git rev-parse HEAD) && \
     export BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') && \
-    # git stash pop && \
-    go mod vendor && \
+    git stash pop && \
     make -f Build.mak cross-platform && \
     cp cosign-linux-amd64 cosign && \
     gzip cosign-linux-amd64 && \