Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Set CURR_VERSION for new v2 release-prep calls #1991

Merged
merged 3 commits into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/manual_msi_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading