Skip to content

Commit ae91e2a

Browse files
committed
Fix Chocolatey version in push
1 parent 3665b98 commit ae91e2a

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Makefile

+4-2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ TEST_SUITE = \
1919
github.com/Graylog2/collector-sidecar/common
2020

2121
WINDOWS_INSTALLER_VERSION = $(COLLECTOR_VERSION)-$(COLLECTOR_REVISION)$(subst -,.,$(COLLECTOR_VERSION_SUFFIX))
22+
# Removing the dot to comply with NuGet versioning (beta.1 -> beta2)
23+
CHOCOLATEY_VERSION = $(COLLECTOR_VERSION).$(COLLECTOR_REVISION)$(subst .,,$(COLLECTOR_VERSION_SUFFIX))
2224

2325
all: build
2426

@@ -135,12 +137,12 @@ package-chocolatey: ## Create Chocolatey .nupkg file
135137
dist/chocolatey/gensha.sh $(COLLECTOR_VERSION) $(COLLECTOR_REVISION) $(COLLECTOR_VERSION_SUFFIX)
136138
# The fourth number in Chocolatey (NuGet) is the revision.
137139
# See: https://learn.microsoft.com/en-us/nuget/concepts/package-versioning#where-nugetversion-diverges-from-semantic-versioning
138-
cd dist/chocolatey && choco pack graylog-sidecar.nuspec --version $(COLLECTOR_VERSION).$(COLLECTOR_REVISION)$(subst .,,$(COLLECTOR_VERSION_SUFFIX)) --out ../pkg
140+
cd dist/chocolatey && choco pack graylog-sidecar.nuspec --version $(CHOCOLATEY_VERSION) --out ../pkg
139141

140142
push-chocolatey: ## Push Chocolatey .nupkg file
141143
# This needs to run in a Docker container based on the Dockerfile.chocolatey image!
142144
# Escape the CHOCO_API_KEY to avoid printing it in the logs!
143-
choco push dist/pkg/graylog-sidecar.$(COLLECTOR_VERSION)$(COLLECTOR_VERSION_SUFFIX).nupkg -k=$$CHOCO_API_KEY
145+
choco push dist/pkg/graylog-sidecar.$(CHOCOLATEY_VERSION).nupkg -k=$$CHOCO_API_KEY
144146

145147
package-tar: ## Create tar archive for all platforms
146148
@mkdir -p dist/pkg

0 commit comments

Comments
 (0)