File tree 1 file changed +4
-2
lines changed
1 file changed +4
-2
lines changed Original file line number Diff line number Diff line change @@ -19,6 +19,8 @@ TEST_SUITE = \
19
19
github.com/Graylog2/collector-sidecar/common
20
20
21
21
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 ) )
22
24
23
25
all : build
24
26
@@ -135,12 +137,12 @@ package-chocolatey: ## Create Chocolatey .nupkg file
135
137
dist/chocolatey/gensha.sh $(COLLECTOR_VERSION ) $(COLLECTOR_REVISION ) $(COLLECTOR_VERSION_SUFFIX )
136
138
# The fourth number in Chocolatey (NuGet) is the revision.
137
139
# 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
139
141
140
142
push-chocolatey : # # Push Chocolatey .nupkg file
141
143
# This needs to run in a Docker container based on the Dockerfile.chocolatey image!
142
144
# 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
144
146
145
147
package-tar : # # Create tar archive for all platforms
146
148
@mkdir -p dist/pkg
You can’t perform that action at this time.
0 commit comments