Set build version using linker flags (#183)

majd · May 20, 2023 · cf926d7 · cf926d7
1 parent 9a361cf
commit cf926d7
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 29 deletions.
diff --git a/.github/workflows/dry-build.yml b/.github/workflows/dry-build.yml
@@ -19,7 +19,6 @@ jobs:
         with:
           go-version: '1.19.3'
           cache: true
-      - run: ./tools/version.sh
       - run: go build -o ipatool-$GOOS-$GOARCH.exe
         env:
           GOOS: windows
@@ -37,7 +36,6 @@ jobs:
         with:
           go-version: '1.19.3'
           cache: true
-      - run: ./tools/version.sh
       - run: go build -o ipatool-$GOOS-$GOARCH
         env:
           GOOS: linux
@@ -55,7 +53,6 @@ jobs:
         with:
           go-version: '1.19.3'
           cache: true
-      - run: ./tools/version.sh
       - run: go build -o ipatool-$GOOS-$GOARCH
         env:
           GOOS: darwin

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -17,7 +17,6 @@ jobs:
         with:
           go-version: '1.19.3'
           cache: true
-      - run: ./tools/version.sh
       - run: go build -o ipatool
         env:
           CGO_CFLAGS: -mmacosx-version-min=10.15

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,7 +23,6 @@ jobs:
         with:
           go-version: '1.19.3'
           cache: true
-      - run: ./tools/version.sh
       - run: go test -v github.com/majd/ipatool/...
   build:
     name: Build
@@ -35,34 +34,39 @@ jobs:
         with:
           go-version: '1.19.3'
           cache: true
-      - run: ./tools/version.sh
-      - run: go build -o ipatool-${{ needs.get_version.outputs.version }}-windows-arm64.exe
+      - run: go build -ldflags="-X github.com/majd/ipatool/cmd.version=$VERSION" -o ipatool-$VERSION-windows-arm64.exe
         env:
           GOOS: windows
           GOARCH: arm64
-      - run: go build -o ipatool-${{ needs.get_version.outputs.version }}-windows-amd64.exe
+          VERSION: ${{ needs.get_version.outputs.version }}
+      - run: go build -ldflags="-X github.com/majd/ipatool/cmd.version=$VERSION" -o ipatool-$VERSION-windows-amd64.exe
         env:
           GOOS: windows
           GOARCH: amd64
-      - run: go build -o ipatool-${{ needs.get_version.outputs.version }}-linux-arm64
+          VERSION: ${{ needs.get_version.outputs.version }}
+      - run: go build -ldflags="-X github.com/majd/ipatool/cmd.version=$VERSION" -o ipatool-$VERSION-linux-arm64
         env:
           GOOS: linux
           GOARCH: arm64
-      - run: go build -o ipatool-${{ needs.get_version.outputs.version }}-linux-amd64
+          VERSION: ${{ needs.get_version.outputs.version }}
+      - run: go build -ldflags="-X github.com/majd/ipatool/cmd.version=$VERSION" -o ipatool-$VERSION-linux-amd64
         env:
           GOOS: linux
           GOARCH: amd64
-      - run: go build -o ipatool-${{ needs.get_version.outputs.version }}-macos-arm64
+          VERSION: ${{ needs.get_version.outputs.version }}
+      - run: go build -ldflags="-X github.com/majd/ipatool/cmd.version=$VERSION" -o ipatool-$VERSION-macos-arm64
         env:
           GOOS: darwin
           GOARCH: arm64
+          VERSION: ${{ needs.get_version.outputs.version }}
           CGO_CFLAGS: -mmacosx-version-min=10.15
           CGO_LDFLAGS: -mmacosx-version-min=10.15
           CGO_ENABLED: 1
-      - run: go build -o ipatool-${{ needs.get_version.outputs.version }}-macos-amd64
+      - run: go build -ldflags="-X github.com/majd/ipatool/cmd.version=$VERSION" -o ipatool-$VERSION-macos-amd64
         env:
           GOOS: darwin
           GOARCH: amd64
+          VERSION: ${{ needs.get_version.outputs.version }}
           CGO_CFLAGS: -mmacosx-version-min=10.15
           CGO_LDFLAGS: -mmacosx-version-min=10.15
           CGO_ENABLED: 1

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -15,5 +15,4 @@ jobs:
         with:
           go-version: '1.19.3'
           cache: true
-      - run: ./tools/version.sh
       - run: go test -v github.com/majd/ipatool/...
diff --git a/.gitignore b/.gitignore
@@ -2,5 +2,4 @@
 .AppleDouble
 .LSOverride
 .vscode/
-.idea/
-cmd/version.go
+.idea/
diff --git a/cmd/root.go b/cmd/root.go
@@ -7,6 +7,8 @@ import (
 	"golang.org/x/net/context"
 )
 
+var version = "dev"
+
 func rootCmd() *cobra.Command {
 	var verbose bool
 	var nonInteractive bool
@@ -48,7 +50,7 @@ func rootCmd() *cobra.Command {
 	return cmd
 }
 
-// Execute runs the program and returns the approperiate exit status code.
+// Execute runs the program and returns the appropriate exit status code.
 func Execute() (exitCode int) {
 	cmd := rootCmd()
 	err := cmd.Execute()

diff --git a/tools/version.sh b/tools/version.sh