From 27bd01daf9f97dce65346264a8b3612783eb496f Mon Sep 17 00:00:00 2001 From: Magnus Reyes Date: Fri, 26 Jul 2024 11:08:08 -0400 Subject: [PATCH] Fix version linking for build --- .github/workflows/publish.yaml | 4 +++- build.sh | 6 +++--- cmd/cmd.go | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index ba531b6..0f0f57f 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -42,10 +42,12 @@ jobs: run: | version=$(echo ${{ github.ref_name }} | cut -dv -f2) echo "version=$version" >> $GITHUB_OUTPUT - - run: go build -ldflags "-X main.version=${{ steps.version.outputs.version }}" -o "./build/${{ matrix.target.output }}" + - run: go build -ldflags "-X github.com/mass8326/imgchop/cmd.version=${{ steps.version.outputs.version }}" -o "./build/${{ matrix.target.output }}" env: GOOS: ${{ matrix.target.os }} GOARCH: ${{ matrix.target.arch }} + - if: matrix.target.os == 'linux' + run: "[[ $(./build/imgchop --version) == '${{ steps.version.outputs.version }}' ]]" - uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ github.token }} diff --git a/build.sh b/build.sh index 84b38e1..5ec958a 100755 --- a/build.sh +++ b/build.sh @@ -2,10 +2,10 @@ cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null || exit 1 -version="v0.1.0" +version="0.0.0-dev" echo "Building linux executable" -GOOS="linux" GOARCH="amd64" go build -ldflags "-X main.version=$version" -o "build/imgchop" +GOOS="linux" GOARCH="amd64" go build -ldflags "-X github.com/mass8326/imgchop/cmd.version=$version" -o "build/imgchop" echo "Building windows executable" -GOOS="windows" GOARCH="amd64" go build -ldflags "-X main.version=$version" -o "build/imgchop.exe" +GOOS="windows" GOARCH="amd64" go build -ldflags "-X github.com/mass8326/imgchop/cmd.version=$version" -o "build/imgchop.exe" diff --git a/cmd/cmd.go b/cmd/cmd.go index 489d563..703090c 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -11,7 +11,8 @@ import ( "github.com/spf13/cobra" ) -var version = "[N/A]" +// This should be defined at build time using ldflags +var version = "0.0.0-invalid" func Execute() { var flags RootFlags