From 6944bd78c54832de48d5392bc4b6fecbd1d09bf8 Mon Sep 17 00:00:00 2001 From: Jan Trejbal Date: Mon, 20 Jan 2025 18:31:43 +0100 Subject: [PATCH] Fix gitversion --- .github/workflows/nightly-release.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml index 52aefe6..375c436 100644 --- a/.github/workflows/nightly-release.yml +++ b/.github/workflows/nightly-release.yml @@ -25,7 +25,7 @@ jobs: - name: Install GitVersion uses: gittools/actions/gitversion/setup@v3.1.3 with: - versionSpec: '6.1.x' + versionSpec: '6.0.5' - name: Use GitVersion id: gitversion # step id used as reference for output values uses: gittools/actions/gitversion/execute@v3.1.3 @@ -40,16 +40,16 @@ jobs: go build -v -ldflags=" -w -s - -X 'main.Version=v${{ steps.gitversion.outputs.SemVer }}' + -X 'main.Version=v${{ steps.gitversion.outputs.FullSemVer }}' -X 'app/build.Time=$( date '+%F %H-%M-%S' )' - -X 'github.com/prometheus/common/version.Version=${{ steps.gitversion.outputs.SemVer }}' + -X 'github.com/prometheus/common/version.Version=${{ steps.gitversion.outputs.FullSemVer }}' -X 'github.com/prometheus/common/version.Revision=${{ steps.gitversion.outputs.VersionSourceSha }}' -X 'github.com/prometheus/common/version.Branch=${{ steps.gitversion.outputs.BranchName }}' -X 'github.com/prometheus/common/version.BuildDate=$( date '+%F %H-%M-%S' )'" - uses: actions/upload-artifact@v4 with: - name: docker_service_exporter.${{ steps.gitversion.outputs.SemVer }} + name: docker_service_exporter.${{ steps.gitversion.outputs.FullSemVer }} path: src/docker_service_exporter - name: Docker Build and push @@ -58,8 +58,8 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} dockerfile: Dockerfile image-name: server - image-tag: ${{ steps.gitversion.outputs.SemVer }} + image-tag: ${{ steps.gitversion.outputs.FullSemVer }} custom-args: | - --build-arg APP_VERSION=${{ steps.gitversion.outputs.SemVer }} + --build-arg APP_VERSION=${{ steps.gitversion.outputs.FullSemVer }} --build-arg APP_REVISION=${{ steps.gitversion.outputs.VersionSourceSha }} --build-arg APP_BRANCH=${{ steps.gitversion.outputs.BranchName }}