From 9ffc638646d36e1cc06b303d0263047c0a01242d Mon Sep 17 00:00:00 2001 From: Lance Ball Date: Mon, 6 Nov 2023 13:05:19 -0500 Subject: [PATCH] :robot: triggering CI on branch 'redhat-v1.2.2' after synching from upstream/v1.2.2 (#148) --- Dockerfile.cli | 18 ++++++++++-------- ci | 2 +- redhat/overlays/Dockerfile.cli | 18 ++++++++++-------- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/Dockerfile.cli b/Dockerfile.cli index 27e5a6e65..e79ba8880 100644 --- a/Dockerfile.cli +++ b/Dockerfile.cli @@ -4,14 +4,16 @@ USER root RUN git config --global --add safe.directory /opt/app-root/src COPY . . -RUN make Makefile.swagger -RUN make -f Build.mak rekor-cli-darwin-amd64 -RUN make -f Build.mak rekor-cli-linux-amd64 -RUN make -f Build.mak rekor-cli-windows - -RUN gzip rekor_cli_darwin_amd64 -RUN gzip rekor_cli_linux_amd64 -RUN gzip rekor_cli_windows_amd64.exe +RUN git stash && \ + export GIT_VERSION=$(git describe --tags --always --dirty) && \ + git stash pop && \ + make Makefile.swagger && \ + make -f Build.mak rekor-cli-darwin-amd64 && \ + make -f Build.mak rekor-cli-linux-amd64 && \ + make -f Build.mak rekor-cli-windows && \ + gzip rekor_cli_darwin_amd64 && \ + gzip rekor_cli_linux_amd64 && \ + gzip rekor_cli_windows_amd64.exe #Install stage FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:b40f52aa68b29634ff45429ee804afbaa61b33de29ae775568933c71610f07a4 diff --git a/ci b/ci index 746907a31..b5a2a161d 100644 --- a/ci +++ b/ci @@ -1 +1 @@ -Mon Oct 30 16:40:30 EDT 2023 +Mon Nov 6 11:53:43 EST 2023 diff --git a/redhat/overlays/Dockerfile.cli b/redhat/overlays/Dockerfile.cli index 27e5a6e65..e79ba8880 100644 --- a/redhat/overlays/Dockerfile.cli +++ b/redhat/overlays/Dockerfile.cli @@ -4,14 +4,16 @@ USER root RUN git config --global --add safe.directory /opt/app-root/src COPY . . -RUN make Makefile.swagger -RUN make -f Build.mak rekor-cli-darwin-amd64 -RUN make -f Build.mak rekor-cli-linux-amd64 -RUN make -f Build.mak rekor-cli-windows - -RUN gzip rekor_cli_darwin_amd64 -RUN gzip rekor_cli_linux_amd64 -RUN gzip rekor_cli_windows_amd64.exe +RUN git stash && \ + export GIT_VERSION=$(git describe --tags --always --dirty) && \ + git stash pop && \ + make Makefile.swagger && \ + make -f Build.mak rekor-cli-darwin-amd64 && \ + make -f Build.mak rekor-cli-linux-amd64 && \ + make -f Build.mak rekor-cli-windows && \ + gzip rekor_cli_darwin_amd64 && \ + gzip rekor_cli_linux_amd64 && \ + gzip rekor_cli_windows_amd64.exe #Install stage FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:b40f52aa68b29634ff45429ee804afbaa61b33de29ae775568933c71610f07a4