Skip to content

Commit

Permalink
Merge pull request #139 from upbound/backport-138-to-release-1.17
Browse files Browse the repository at this point in the history
[Backport release-1.17] Fix crossplane internal version in ci
  • Loading branch information
turkenh authored Sep 16, 2024
2 parents 36f557d + 0c67deb commit 484d47b
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,12 @@ go-build:
ARG EARTHLY_GIT_SHORT_HASH
ARG EARTHLY_GIT_COMMIT_TIMESTAMP
ARG CROSSPLANE_VERSION=v0.0.0-${EARTHLY_GIT_COMMIT_TIMESTAMP}-${EARTHLY_GIT_SHORT_HASH}
ARG CROSSPLANE_INTERNAL_VERSION=${CROSSPLANE_VERSION}
ARG TARGETARCH
ARG TARGETOS
ARG GOARCH=${TARGETARCH}
ARG GOOS=${TARGETOS}
ARG GOFLAGS="-ldflags=-X=github.com/crossplane/crossplane/internal/version.version=${CROSSPLANE_VERSION}"
ARG GOFLAGS="-ldflags=-X=github.com/crossplane/crossplane/internal/version.version=${CROSSPLANE_INTERNAL_VERSION}"
ARG CGO_ENABLED=0
FROM +go-modules
LET ext = ""
Expand Down Expand Up @@ -345,7 +346,8 @@ helm-setup:
# ci-version is used by CI to set the CROSSPLANE_VERSION environment variable.
ci-version:
LOCALLY
RUN echo "CROSSPLANE_VERSION=$(git describe --dirty --always --tags|sed -e 's/-/./2g'|sed 's/[\.,-]up.*//')" > $GITHUB_ENV
RUN echo "CROSSPLANE_VERSION=$(git describe --dirty --always --tags|sed -e 's/-/./2g')" > $GITHUB_ENV
RUN echo "CROSSPLANE_INTERNAL_VERSION=$(git describe --dirty --always --tags|sed -e 's/-/./2g'|sed -e 's/[\.,-]up.*//')" >> $GITHUB_ENV

# ci-artifacts is used by CI to build and push the Crossplane image, chart, and
# binaries.
Expand Down

0 comments on commit 484d47b

Please sign in to comment.