From 1d8f6c75c815a8d7e52c6e6610ffe7298f9580c5 Mon Sep 17 00:00:00 2001 From: Jakub Date: Mon, 19 Feb 2024 11:55:55 +0100 Subject: [PATCH] feat(GODT-3253): use new virtual machine for windows jobs. bump vcpkg to 2024.02.14 --- Makefile | 1 + ci/build.yml | 3 +++ ci/env.yml | 18 +++++++++++------- ci/test.yml | 2 ++ extern/vcpkg | 2 +- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index e5dd1ebf..8c8fdee5 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ export GO111MODULE=on +export CGO_ENABLED=1 # By default, the target OS is the same as the host OS, # but this can be overridden by setting TARGET_OS to "windows"/"darwin"/"linux". diff --git a/ci/build.yml b/ci/build.yml index 812133f4..432ed060 100644 --- a/ci/build.yml +++ b/ci/build.yml @@ -7,6 +7,9 @@ extends: - .rules-branch-and-MR-manual script: + - which go && go version + - which gcc && gcc --version + - which qmake && qmake --version - make build - git diff && git diff-index --quiet HEAD - make vault-editor diff --git a/ci/env.yml b/ci/env.yml index 3d8cf6e3..67e07144 100644 --- a/ci/env.yml +++ b/ci/env.yml @@ -2,27 +2,31 @@ --- .env-windows: + extends: + - .image-windows-virt-build before_script: - - export BRIDGE_SYNC_FORCE_MINIMUM_SPEC=1 - - !reference [.before-script-windows-aws-build, before_script] + - !reference [.before-script-windows-virt-build, before_script] - !reference [.before-script-git-config, before_script] - - git config --global safe.directory '*' - - git status --porcelain + - mkdir -p .cache/bin + - export PATH=$(pwd)/.cache/bin:$PATH + - export GOPATH="$CI_PROJECT_DIR/.cache" + variables: + GOARCH: amd64 + BRIDGE_SYNC_FORCE_MINIMUM_SPEC: 1 + VCPKG_DEFAULT_BINARY_CACHE: ${CI_PROJECT_DIR}/.cache cache: {} - tags: - - windows-bridge .env-darwin: extends: - .image-darwin-build before_script: - - export BRIDGE_SYNC_FORCE_MINIMUM_SPEC=1 - !reference [.before-script-darwin-tart-build, before_script] - !reference [.before-script-git-config, before_script] - mkdir -p .cache/bin - export PATH=$(pwd)/.cache/bin:$PATH - export GOPATH="$CI_PROJECT_DIR/.cache" variables: + BRIDGE_SYNC_FORCE_MINIMUM_SPEC: 1 VCPKG_DEFAULT_BINARY_CACHE: ${CI_PROJECT_DIR}/.cache cache: key: darwin-go-and-vcpkg diff --git a/ci/test.yml b/ci/test.yml index f93cde0f..8fc2f041 100644 --- a/ci/test.yml +++ b/ci/test.yml @@ -26,6 +26,8 @@ lint-bug-report-preview: extends: - .rules-branch-manual-MR-and-devel-always script: + - which go && go version + - which gcc && gcc --version - make test artifacts: paths: diff --git a/extern/vcpkg b/extern/vcpkg index d4d39d71..fba75d09 160000 --- a/extern/vcpkg +++ b/extern/vcpkg @@ -1 +1 @@ -Subproject commit d4d39d71b3e6dd7536592c36ab2f7e84a8a64942 +Subproject commit fba75d09065fcc76a25dcf386b1d00d33f5175af