forked from Silverfish/proton-bridge
feat(GODT-3253): windows cache and paths.
This commit is contained in:
Jakub Cuth
4
Makefile
4
Makefile
@ -91,7 +91,7 @@ ifeq "${TARGET_OS}" "darwin"
|
|||||||
mv ${BRIDGE_EXE} ${BRIDGE_EXE_NAME}
|
mv ${BRIDGE_EXE} ${BRIDGE_EXE_NAME}
|
||||||
endif
|
endif
|
||||||
|
|
||||||
go-build=go build $(1) -o "$(2)" "$(3)"
|
go-build=go build $(1) -o $(2) $(3)
|
||||||
go-build-finalize=${go-build}
|
go-build-finalize=${go-build}
|
||||||
ifeq "${GOOS}-$(shell uname -m)" "darwin-arm64"
|
ifeq "${GOOS}-$(shell uname -m)" "darwin-arm64"
|
||||||
go-build-finalize= \
|
go-build-finalize= \
|
||||||
@ -118,7 +118,7 @@ versioner:
|
|||||||
go build ${BUILD_FLAGS} -o versioner utils/versioner/main.go
|
go build ${BUILD_FLAGS} -o versioner utils/versioner/main.go
|
||||||
|
|
||||||
vault-editor:
|
vault-editor:
|
||||||
$(call go-build-finalize,"-tags=debug","vault-editor","./utils/vault-editor/main.go")
|
$(call go-build-finalize,-tags=debug,"vault-editor","./utils/vault-editor/main.go")
|
||||||
|
|
||||||
bridge-rollout:
|
bridge-rollout:
|
||||||
$(call go-build-finalize,, "bridge-rollout","./utils/bridge-rollout/bridge-rollout.go")
|
$(call go-build-finalize,, "bridge-rollout","./utils/bridge-rollout/bridge-rollout.go")
|
||||||
|
|||||||
@ -10,7 +10,7 @@
|
|||||||
- which go && go version
|
- which go && go version
|
||||||
- which gcc && gcc --version
|
- which gcc && gcc --version
|
||||||
- which qmake && qmake --version
|
- which qmake && qmake --version
|
||||||
- make -d build
|
- make build
|
||||||
- git diff && git diff-index --quiet HEAD
|
- git diff && git diff-index --quiet HEAD
|
||||||
- make vault-editor
|
- make vault-editor
|
||||||
- make bridge-rollout
|
- make bridge-rollout
|
||||||
|
|||||||
@ -14,7 +14,11 @@
|
|||||||
GOARCH: amd64
|
GOARCH: amd64
|
||||||
BRIDGE_SYNC_FORCE_MINIMUM_SPEC: 1
|
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: windows-vcpkg-go-0
|
||||||
|
paths:
|
||||||
|
- .cache
|
||||||
|
when: 'always'
|
||||||
|
|
||||||
.env-darwin:
|
.env-darwin:
|
||||||
extends:
|
extends:
|
||||||
|
|||||||
224
ci/test.yml
224
ci/test.yml
@ -28,125 +28,125 @@ lint-bug-report-preview:
|
|||||||
script:
|
script:
|
||||||
- which go && go version
|
- which go && go version
|
||||||
- which gcc && gcc --version
|
- which gcc && gcc --version
|
||||||
- make -d test
|
- make test
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
- coverage/**
|
- coverage/**
|
||||||
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# test-linux:
|
test-linux:
|
||||||
# extends:
|
extends:
|
||||||
# - .image-linux-test
|
- .image-linux-test
|
||||||
# - .script-test
|
- .script-test
|
||||||
# tags:
|
tags:
|
||||||
# - shared-large
|
- shared-large
|
||||||
|
|
||||||
test-windows:
|
test-windows:
|
||||||
extends:
|
extends:
|
||||||
- .env-windows
|
- .env-windows
|
||||||
- .script-test
|
- .script-test
|
||||||
|
|
||||||
# test-darwin:
|
test-darwin:
|
||||||
# extends:
|
extends:
|
||||||
# - .env-darwin
|
- .env-darwin
|
||||||
# - .script-test
|
- .script-test
|
||||||
#
|
|
||||||
# fuzz-linux:
|
fuzz-linux:
|
||||||
# stage: test
|
stage: test
|
||||||
# extends:
|
extends:
|
||||||
# - .image-linux-test
|
- .image-linux-test
|
||||||
# - .rules-branch-manual-MR-and-devel-always
|
- .rules-branch-manual-MR-and-devel-always
|
||||||
# script:
|
script:
|
||||||
# - make fuzz
|
- make fuzz
|
||||||
# tags:
|
tags:
|
||||||
# - shared-large
|
- shared-large
|
||||||
#
|
|
||||||
# test-linux-race:
|
test-linux-race:
|
||||||
# extends:
|
extends:
|
||||||
# - test-linux
|
- test-linux
|
||||||
# - .rules-branch-and-MR-manual
|
- .rules-branch-and-MR-manual
|
||||||
# script:
|
script:
|
||||||
# - make test-race
|
- make test-race
|
||||||
#
|
|
||||||
# test-integration:
|
test-integration:
|
||||||
# extends:
|
extends:
|
||||||
# - test-linux
|
- test-linux
|
||||||
# script:
|
script:
|
||||||
# - make test-integration | tee -a integration-job.log
|
- make test-integration | tee -a integration-job.log
|
||||||
# after_script:
|
after_script:
|
||||||
# - |
|
- |
|
||||||
# grep "Error: " integration-job.log
|
grep "Error: " integration-job.log
|
||||||
# artifacts:
|
artifacts:
|
||||||
# when: always
|
when: always
|
||||||
# paths:
|
paths:
|
||||||
# - integration-job.log
|
- integration-job.log
|
||||||
#
|
|
||||||
# test-integration-race:
|
test-integration-race:
|
||||||
# extends:
|
extends:
|
||||||
# - test-integration
|
- test-integration
|
||||||
# - .rules-branch-and-MR-manual
|
- .rules-branch-and-MR-manual
|
||||||
# script:
|
script:
|
||||||
# - make test-integration-race | tee -a integration-race-job.log
|
- make test-integration-race | tee -a integration-race-job.log
|
||||||
# artifacts:
|
artifacts:
|
||||||
# when: always
|
when: always
|
||||||
# paths:
|
paths:
|
||||||
# - integration-race-job.log
|
- integration-race-job.log
|
||||||
#
|
|
||||||
#
|
|
||||||
# test-integration-nightly:
|
test-integration-nightly:
|
||||||
# extends:
|
extends:
|
||||||
# - test-integration
|
- test-integration
|
||||||
# - .rules-branch-manual-scheduled-and-test-branch-always
|
- .rules-branch-manual-scheduled-and-test-branch-always
|
||||||
# needs:
|
needs:
|
||||||
# - test-integration
|
- test-integration
|
||||||
# script:
|
script:
|
||||||
# - make test-integration-nightly | tee -a nightly-job.log
|
- make test-integration-nightly | tee -a nightly-job.log
|
||||||
# after_script:
|
after_script:
|
||||||
# - |
|
- |
|
||||||
# grep "Error: " nightly-job.log
|
grep "Error: " nightly-job.log
|
||||||
# artifacts:
|
artifacts:
|
||||||
# when: always
|
when: always
|
||||||
# paths:
|
paths:
|
||||||
# - nightly-job.log
|
- nightly-job.log
|
||||||
#
|
|
||||||
# test-coverage:
|
test-coverage:
|
||||||
# stage: test
|
stage: test
|
||||||
# extends:
|
extends:
|
||||||
# - .image-linux-test
|
- .image-linux-test
|
||||||
# - .rules-branch-manual-scheduled-and-test-branch-always
|
- .rules-branch-manual-scheduled-and-test-branch-always
|
||||||
# script:
|
script:
|
||||||
# - ./utils/coverage.sh
|
- ./utils/coverage.sh
|
||||||
# coverage: '/total:.*\(statements\).*\d+\.\d+%/'
|
coverage: '/total:.*\(statements\).*\d+\.\d+%/'
|
||||||
# needs:
|
needs:
|
||||||
# - test-linux
|
- test-linux
|
||||||
# - test-windows
|
- test-windows
|
||||||
# - test-darwin
|
- test-darwin
|
||||||
# - test-integration
|
- test-integration
|
||||||
# - test-integration-nightly
|
- test-integration-nightly
|
||||||
# tags:
|
tags:
|
||||||
# - shared-small
|
- shared-small
|
||||||
# artifacts:
|
artifacts:
|
||||||
# paths:
|
paths:
|
||||||
# - coverage*
|
- coverage*
|
||||||
# - coverage/**
|
- coverage/**
|
||||||
# when: 'always'
|
when: 'always'
|
||||||
# reports:
|
reports:
|
||||||
# coverage_report:
|
coverage_report:
|
||||||
# coverage_format: cobertura
|
coverage_format: cobertura
|
||||||
# path: coverage.xml
|
path: coverage.xml
|
||||||
#
|
|
||||||
# go-vuln-check:
|
go-vuln-check:
|
||||||
# extends:
|
extends:
|
||||||
# - .image-linux-test
|
- .image-linux-test
|
||||||
# - .rules-branch-manual-MR-and-devel-always
|
- .rules-branch-manual-MR-and-devel-always
|
||||||
# stage: test
|
stage: test
|
||||||
# tags:
|
tags:
|
||||||
# - shared-medium
|
- shared-medium
|
||||||
# script:
|
script:
|
||||||
# - ./utils/govulncheck.sh
|
- ./utils/govulncheck.sh
|
||||||
# artifacts:
|
artifacts:
|
||||||
# when: always
|
when: always
|
||||||
# paths:
|
paths:
|
||||||
# - vulns*
|
- vulns*
|
||||||
#
|
|
||||||
|
|||||||
@ -140,7 +140,7 @@ if (WIN32) # on Windows, we add a (non-Qt) resource file that contains the appli
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_precompile_headers(bridge-gui PRIVATE Pch.h)
|
target_precompile_headers(bridge-gui PRIVATE Pch.h)
|
||||||
target_include_directories(bridge-gui PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${SENTRY_CONFIG_GENERATED_FILE_DIR})
|
target_include_directories(bridge-gui PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" ${SENTRY_CONFIG_GENERATED_FILE_DIR})
|
||||||
target_link_libraries(bridge-gui
|
target_link_libraries(bridge-gui
|
||||||
Qt6::Widgets
|
Qt6::Widgets
|
||||||
Qt6::Core
|
Qt6::Core
|
||||||
|
|||||||
@ -31,7 +31,7 @@ macro( AppendLib LIB_NAME HINT_PATH)
|
|||||||
if( ${PATH_${UP_NAME}} STREQUAL "PATH_${UP_NAME}-NOTFOUND")
|
if( ${PATH_${UP_NAME}} STREQUAL "PATH_${UP_NAME}-NOTFOUND")
|
||||||
message(SEND_ERROR "${LIB_NAME} was not found in ${HINT_PATH}")
|
message(SEND_ERROR "${LIB_NAME} was not found in ${HINT_PATH}")
|
||||||
else()
|
else()
|
||||||
list(APPEND DEPLOY_LIBS ${PATH_${UP_NAME}})
|
list(APPEND DEPLOY_LIBS "${PATH_${UP_NAME}}")
|
||||||
endif()
|
endif()
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
|
|||||||
@ -102,6 +102,7 @@ git submodule update --init --recursive $vcpkgRoot
|
|||||||
-S . -B $buildDir
|
-S . -B $buildDir
|
||||||
|
|
||||||
check_exit "CMake failed"
|
check_exit "CMake failed"
|
||||||
|
|
||||||
. $cmakeExe --build $buildDir --config "$buildConfig"
|
. $cmakeExe --build $buildDir --config "$buildConfig"
|
||||||
check_exit "Build failed"
|
check_exit "Build failed"
|
||||||
|
|
||||||
@ -109,7 +110,7 @@ if ($($args.count) -gt 0 )
|
|||||||
{
|
{
|
||||||
if ($args[0] = "install")
|
if ($args[0] = "install")
|
||||||
{
|
{
|
||||||
. $cmakeExe --install $buildDir
|
. $cmakeExe --install "$buildDir" -v
|
||||||
check_exit "Install failed"
|
check_exit "Install failed"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user