yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

feat: use zip for windows targetos

Browse Source
This commit is contained in:
James Houlahan
2020-05-18 12:26:54 +02:00
parent 41f6cd3bcd
commit 3c92ff18ff
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -143,6 +143,8 @@ build-windows:
variables: variables:
DOCKER_HOST: tcp://docker:2375 DOCKER_HOST: tcp://docker:2375
script: script:
# We need to install docker because qtdeploy builds for windows inside a docker container.
# Docker will connect to the dockerd daemon provided by the runner service docker:dind at tcp://docker:2375.
- curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh - curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh
- apt-get update && apt-get -y install binutils-mingw-w64 - apt-get update && apt-get -y install binutils-mingw-w64
- ln -s /usr/bin/x86_64-w64-mingw32-windres /usr/bin/windres - ln -s /usr/bin/x86_64-w64-mingw32-windres /usr/bin/windres
@ -151,7 +153,7 @@ build-windows:
artifacts: artifacts:
name: "bridge-windows-$CI_COMMIT_SHORT_SHA" name: "bridge-windows-$CI_COMMIT_SHORT_SHA"
paths: paths:
- bridge_*.tgz - bridge_*.zip
expire_in: 2 week expire_in: 2 week
mirror-repo: mirror-repo:

9
Makefile
View File

@ -37,8 +37,13 @@ ifeq "${TARGET_OS}" "darwin"
endif endif
EXE_TARGET:=${DEPLOY_DIR}/${TARGET_OS}/${EXE} EXE_TARGET:=${DEPLOY_DIR}/${TARGET_OS}/${EXE}
TGZ_TARGET:=bridge_${TARGET_OS}_${REVISION}.tgz TGZ_TARGET:=bridge_${TARGET_OS}_${REVISION}.tgz
ZIP_TARGET:=bridge_${TARGET_OS}_${REVISION}.zip
ifeq "${TARGET_OS}" "windows"
build: ${ZIP_TARGET}
else
build: ${TGZ_TARGET} build: ${TGZ_TARGET}
endif
build-nogui: build-nogui:
go build ${BUILD_FLAGS_NOGUI} -o Desktop-Bridge cmd/Desktop-Bridge/main.go go build ${BUILD_FLAGS_NOGUI} -o Desktop-Bridge cmd/Desktop-Bridge/main.go
@ -47,6 +52,10 @@ ${TGZ_TARGET}: ${DEPLOY_DIR}/${TARGET_OS}
rm -f $@ rm -f $@
cd ${DEPLOY_DIR} && tar czf ../../../$@ ${TARGET_OS} cd ${DEPLOY_DIR} && tar czf ../../../$@ ${TARGET_OS}
${ZIP_TARGET}: ${DEPLOY_DIR}/${TARGET_OS}
rm -f $@
cd ${DEPLOY_DIR} && zip -r ../../../$@ ${TARGET_OS}
${DEPLOY_DIR}/linux: ${EXE_TARGET} ${DEPLOY_DIR}/linux: ${EXE_TARGET}
cp -pf ./internal/frontend/share/icons/logo.svg ${DEPLOY_DIR}/linux/ cp -pf ./internal/frontend/share/icons/logo.svg ${DEPLOY_DIR}/linux/
cp -pf ./LICENSE ${DEPLOY_DIR}/linux/ cp -pf ./LICENSE ${DEPLOY_DIR}/linux/