From 958f346047fc4ee8db6ba814cbb3c92f7a5c5278 Mon Sep 17 00:00:00 2001 From: Ian Adams Date: Tue, 3 Dec 2024 16:45:42 +0000 Subject: [PATCH] fix: Set CURR_VERSION for new v2 release-prep calls (#1991) * Set CURR_VERSION for new v2 release-prep calls * Adjust where v is placed * Update manual_msi_build to use correct curr_version --- .github/workflows/manual_msi_build.yml | 2 +- .github/workflows/release.yml | 2 +- .goreleaser.yml | 2 +- Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/manual_msi_build.yml b/.github/workflows/manual_msi_build.yml index f1d5eade9..b3fad5348 100644 --- a/.github/workflows/manual_msi_build.yml +++ b/.github/workflows/manual_msi_build.yml @@ -21,7 +21,7 @@ jobs: - name: Install tools run: make install-tools - name: Release Prep - run: make release-prep + run: make release-prep CURR_VERSION=${{ github.event.inputs.version }} - name: Build Binaries run: make build-binaries - name: Copy Windows Collector Binary diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 591af8c0a..82e5f1b34 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: run: make install-tools # Needed until supervisor binary is released - name: Build Supervisor Binary - run: make release-prep + run: make release-prep CURR_VERSION=${{ github.ref_name }} - name: Build Windows Binaries run: make build-binaries - name: Copy Windows Collector Binary diff --git a/.goreleaser.yml b/.goreleaser.yml index 4054205bf..2361d39c1 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -4,7 +4,7 @@ project_name: observiq-otel-collector before: hooks: - - make release-prep CURR_VERSION={{ .Version }} + - make release-prep CURR_VERSION=v{{ .Version }} - make build-all OUTDIR="tmp" after: diff --git a/Makefile b/Makefile index ac1d11de8..20df77497 100644 --- a/Makefile +++ b/Makefile @@ -244,7 +244,7 @@ update-modules: release-prep: @rm -rf release_deps @mkdir release_deps - @echo 'v$(CURR_VERSION)' > release_deps/VERSION.txt + @echo '$(CURR_VERSION)' > release_deps/VERSION.txt bash ./buildscripts/download-dependencies.sh release_deps @cp -r ./plugins release_deps/ @cp service/com.observiq.collector.plist release_deps/com.observiq.collector.plist