From 41f6cd3bcd49cd3fccdd7f4fc9e448f250b347dd Mon Sep 17 00:00:00 2001 From: James Houlahan Date: Mon, 18 May 2020 10:30:18 +0200 Subject: [PATCH] feat: build windows in pipeline --- .gitlab-ci.yml | 20 ++++++++++++++++++++ Makefile | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1ed4d0b2..5e7ca454 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -134,6 +134,26 @@ build-darwin: - bridge_*.tgz expire_in: 2 week +build-windows: + stage: build + services: + - docker:dind + only: + - devel + variables: + DOCKER_HOST: tcp://docker:2375 + script: + - curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh + - apt-get update && apt-get -y install binutils-mingw-w64 + - ln -s /usr/bin/x86_64-w64-mingw32-windres /usr/bin/windres + - go mod download + - TARGET_OS=windows make build + artifacts: + name: "bridge-windows-$CI_COMMIT_SHORT_SHA" + paths: + - bridge_*.tgz + expire_in: 2 week + mirror-repo: stage: mirror only: diff --git a/Makefile b/Makefile index 41a66958..0aff29f3 100644 --- a/Makefile +++ b/Makefile @@ -84,7 +84,7 @@ logo.ico: ./internal/frontend/share/icons/logo.ico icon.rc: ./internal/frontend/share/icon.rc cp $^ . ./internal/frontend/qt/icon_windows.syso: ./internal/frontend/share/icon.rc logo.ico - windres --target=coff-x86-64 -o $@ $< + windres --target=pe-x86-64 -o $@ $< icon_windows.syso: ./internal/frontend/qt/icon_windows.syso cp $^ .