Skip to content

Commit a801be1

Browse files
authored
APP-7356 alter windows release filename to work with discovery (viamrobotics#4757)
1 parent a5a072f commit a801be1

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

packaging.make

+6-7
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,17 @@ static-release: server-static-compressed
5555
--arch ${UNAME_M} \
5656
--output-path etc/packaging/static/manifest/viam-server-${BUILD_CHANNEL}-${UNAME_M}.json
5757

58-
static-release-win: FILENAME_OS=-windows
5958
static-release-win:
60-
# note: FILENAME_OS will be -windows for windows builds; for backwards compatibility, we don't do this for linux.
6159
rm -f bin/static/viam-server-windows.exe
6260
GOOS=windows GOARCH=amd64 go build -tags no_cgo,osusergo,netgo -ldflags="-extldflags=-static $(COMMON_LDFLAGS)" -o bin/static/viam-server-windows.exe ./web/cmd/server
6361
upx --best --lzma bin/static/viam-server-windows.exe
6462

6563
rm -rf etc/packaging/static/deploy/
6664
mkdir -p etc/packaging/static/deploy/
67-
cp bin/static/viam-server-windows.exe etc/packaging/static/deploy/viam-server$(FILENAME_OS)-${BUILD_CHANNEL}-${UNAME_M}.exe
65+
cp bin/static/viam-server-windows.exe etc/packaging/static/deploy/viam-server-${BUILD_CHANNEL}-windows-${UNAME_M}
66+
# note: the stable/latest file still has a .exe extension because we expect this to be a known URL that people download + want to have usable.
6867
if [ "${RELEASE_TYPE}" = "stable" ] || [ "${RELEASE_TYPE}" = "latest" ]; then \
69-
cp bin/static/viam-server-windows.exe etc/packaging/static/deploy/viam-server$(FILENAME_OS)-${RELEASE_TYPE}-${UNAME_M}.exe; \
68+
cp bin/static/viam-server-windows.exe etc/packaging/static/deploy/viam-server-${RELEASE_TYPE}-windows-${UNAME_M}.exe; \
7069
fi
7170

7271
# note: GOOS=windows would break this on a linux runner
@@ -75,9 +74,9 @@ static-release-win:
7574
rm -rf etc/packaging/static/manifest/
7675
mkdir -p etc/packaging/static/manifest/
7776
go run ./etc/subsystem_manifest \
78-
--binary-path etc/packaging/static/deploy/viam-server$(FILENAME_OS)-${BUILD_CHANNEL}-${UNAME_M}.exe \
79-
--upload-path packages.viam.com/apps/viam-server/viam-server$(FILENAME_OS)-${BUILD_CHANNEL}-${UNAME_M}.exe \
77+
--binary-path etc/packaging/static/deploy/viam-server-${BUILD_CHANNEL}-windows-${UNAME_M} \
78+
--upload-path packages.viam.com/apps/viam-server/viam-server-${BUILD_CHANNEL}-windows-${UNAME_M} \
8079
--version ${BUILD_CHANNEL} \
8180
--arch ${UNAME_M} \
8281
--resources-json win-resources.json \
83-
--output-path etc/packaging/static/manifest/viam-server$(FILENAME_OS)-${BUILD_CHANNEL}-${UNAME_M}.json
82+
--output-path etc/packaging/static/manifest/viam-server-${BUILD_CHANNEL}-windows-${UNAME_M}.json

0 commit comments

Comments
 (0)