diff options
| -rw-r--r-- | .github/workflows/release.yml | 4 | ||||
| -rw-r--r-- | VERSION | 1 | ||||
| -rw-r--r-- | embeds/VERSION | 1 | ||||
| -rw-r--r-- | embeds/embeds.go | 4 | ||||
| -rw-r--r-- | flake.nix | 3 |
5 files changed, 5 insertions, 8 deletions
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 89ace0a..439da0f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,9 +22,6 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set RELEASE_TAG env - run: echo RELEASE_TAG=$(echo ${GITHUB_REF/refs\/tags\//}) >> ${GITHUB_ENV} - - name: Set COMMIT env run: echo COMMIT=$(git rev-parse --short=7 HEAD) >> ${GITHUB_ENV} @@ -38,7 +35,6 @@ jobs: goarch: ${{ matrix.goarch }} binary_name: eko ldflags: > - -X "github.com/kyren223/eko/embeds.Version=${{ env.RELEASE_TAG }}" -X "github.com/kyren223/eko/embeds.Commit=${{ env.COMMIT }}" -X "github.com/kyren223/eko/embeds.BuildDate=${{ env.BUILD_DATE }}" project_path: ./cmd/client diff --git a/VERSION b/VERSION deleted file mode 100644 index b82608c..0000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -v0.1.0 diff --git a/embeds/VERSION b/embeds/VERSION new file mode 100644 index 0000000..3527dbc --- /dev/null +++ b/embeds/VERSION @@ -0,0 +1 @@ +v0.0.11 diff --git a/embeds/embeds.go b/embeds/embeds.go index 2cf0dcc..8bb7787 100644 --- a/embeds/embeds.go +++ b/embeds/embeds.go @@ -21,8 +21,10 @@ import ( "sync/atomic" ) +//go:embed VERSION +var Version string + var ( - Version string = "unknown" Commit string = "unknown" BuildDate string = "unknown" ) @@ -21,7 +21,7 @@ pkgs = import inputs.nixpkgs { inherit system overlays; }; - version = (builtins.readFile ./VERSION); + version = (builtins.readFile ./embeds/VERSION); buildDate = toString self.lastModified; commit = if (builtins.hasAttr "rev" self) then (builtins.substring 0 7 self.rev) else "unknown"; # vendorHash = pkgs.lib.fakeHash; @@ -37,7 +37,6 @@ in (if (debug-tracing) then pkgs.lib.sources.trace source-files else source-files); ldflags = [ - "-X github.com/kyren223/eko/embeds.Version=${version}" "-X github.com/kyren223/eko/embeds.Commit=${commit}" "-X github.com/kyren223/eko/embeds.BuildDate=${buildDate}" ]; |