mirror of
https://github.com/ProtonMail/proton-bridge.git
synced 2025-12-10 04:36:43 +00:00
feat(GODT-3253): use new virtual machine for windows jobs. bump vcpkg to 2024.02.14
This commit is contained in:
1
Makefile
1
Makefile
@ -1,4 +1,5 @@
|
|||||||
export GO111MODULE=on
|
export GO111MODULE=on
|
||||||
|
export CGO_ENABLED=1
|
||||||
|
|
||||||
# By default, the target OS is the same as the host OS,
|
# 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".
|
# but this can be overridden by setting TARGET_OS to "windows"/"darwin"/"linux".
|
||||||
|
|||||||
@ -7,6 +7,9 @@
|
|||||||
extends:
|
extends:
|
||||||
- .rules-branch-and-MR-manual
|
- .rules-branch-and-MR-manual
|
||||||
script:
|
script:
|
||||||
|
- which go && go version
|
||||||
|
- which gcc && gcc --version
|
||||||
|
- which qmake && qmake --version
|
||||||
- make build
|
- make build
|
||||||
- git diff && git diff-index --quiet HEAD
|
- git diff && git diff-index --quiet HEAD
|
||||||
- make vault-editor
|
- make vault-editor
|
||||||
|
|||||||
18
ci/env.yml
18
ci/env.yml
@ -2,27 +2,31 @@
|
|||||||
---
|
---
|
||||||
|
|
||||||
.env-windows:
|
.env-windows:
|
||||||
|
extends:
|
||||||
|
- .image-windows-virt-build
|
||||||
before_script:
|
before_script:
|
||||||
- export BRIDGE_SYNC_FORCE_MINIMUM_SPEC=1
|
- !reference [.before-script-windows-virt-build, before_script]
|
||||||
- !reference [.before-script-windows-aws-build, before_script]
|
|
||||||
- !reference [.before-script-git-config, before_script]
|
- !reference [.before-script-git-config, before_script]
|
||||||
- git config --global safe.directory '*'
|
- mkdir -p .cache/bin
|
||||||
- git status --porcelain
|
- 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: {}
|
cache: {}
|
||||||
tags:
|
|
||||||
- windows-bridge
|
|
||||||
|
|
||||||
.env-darwin:
|
.env-darwin:
|
||||||
extends:
|
extends:
|
||||||
- .image-darwin-build
|
- .image-darwin-build
|
||||||
before_script:
|
before_script:
|
||||||
- export BRIDGE_SYNC_FORCE_MINIMUM_SPEC=1
|
|
||||||
- !reference [.before-script-darwin-tart-build, before_script]
|
- !reference [.before-script-darwin-tart-build, before_script]
|
||||||
- !reference [.before-script-git-config, before_script]
|
- !reference [.before-script-git-config, before_script]
|
||||||
- mkdir -p .cache/bin
|
- mkdir -p .cache/bin
|
||||||
- export PATH=$(pwd)/.cache/bin:$PATH
|
- export PATH=$(pwd)/.cache/bin:$PATH
|
||||||
- export GOPATH="$CI_PROJECT_DIR/.cache"
|
- export GOPATH="$CI_PROJECT_DIR/.cache"
|
||||||
variables:
|
variables:
|
||||||
|
BRIDGE_SYNC_FORCE_MINIMUM_SPEC: 1
|
||||||
VCPKG_DEFAULT_BINARY_CACHE: ${CI_PROJECT_DIR}/.cache
|
VCPKG_DEFAULT_BINARY_CACHE: ${CI_PROJECT_DIR}/.cache
|
||||||
cache:
|
cache:
|
||||||
key: darwin-go-and-vcpkg
|
key: darwin-go-and-vcpkg
|
||||||
|
|||||||
@ -26,6 +26,8 @@ lint-bug-report-preview:
|
|||||||
extends:
|
extends:
|
||||||
- .rules-branch-manual-MR-and-devel-always
|
- .rules-branch-manual-MR-and-devel-always
|
||||||
script:
|
script:
|
||||||
|
- which go && go version
|
||||||
|
- which gcc && gcc --version
|
||||||
- make test
|
- make test
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
|
|||||||
2
extern/vcpkg
vendored
2
extern/vcpkg
vendored
Submodule extern/vcpkg updated: d4d39d71b3...fba75d0906
Reference in New Issue
Block a user