aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom2019-11-19 07:34:48 +0100
committerTom2019-11-19 07:34:48 +0100
commit9f94ad63364f762d22d77f5348e8a280486f02f0 (patch)
tree62baabf498696f1c9379478ade5407b17c3aa6b5
parent455b2bec7642b0b5ba2d55ab246115b8e7f58fbb (diff)
downloadsonar-css-9f94ad63364f762d22d77f5348e8a280486f02f0.tar.bz2
Fix cirrus-ci cache issue
-rw-r--r--.cirrus.yml16
1 files changed, 11 insertions, 5 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 9e677ef..7ed0829 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -14,6 +14,8 @@ env:
BURGR_URL: ENCRYPTED[!c7e294da94762d7bac144abef6310c5db300c95979daed4454ca977776bfd5edeb557e1237e3aa8ed722336243af2d78!]
BURGR_USERNAME: ENCRYPTED[!b29ddc7610116de511e74bec9a93ad9b8a20ac217a0852e94a96d0066e6e822b95e7bc1fe152afb707f16b70605fddd3!]
BURGR_PASSWORD: ENCRYPTED[!83e130718e92b8c9de7c5226355f730e55fb46e45869149a9223e724bb99656878ef9684c5f8cfef434aa716e87f4cf2!]
+ # Use bash (instead of sh on linux or cmd.exe on windows)
+ CIRRUS_SHELL: bash
container_definition: &CONTAINER_DEFINITION
image: gcr.io/language-team/base:latest
@@ -47,7 +49,7 @@ build_task:
#allow deployment of pull request artifacts to repox
DEPLOY_PULL_REQUEST: true
maven_cache:
- folder: $CIRRUS_WORKING_DIR/.m2/repository
+ folder: ${CIRRUS_WORKING_DIR}/.m2/repository
build_script:
- source cirrus-env BUILD
- regular_mvn_build_deploy_analyze
@@ -55,9 +57,13 @@ build_task:
build_win_task:
<<: *WINDOWS_VM_DEFINITION
+ maven_cache:
+ #windows cache fails with ${CIRRUS_WORKING_DIR}
+ folder: ~/.m2/repository
build_script:
- - mvn.cmd test
-
+ - mvn.cmd -s /c/buildTools-docker/settings-public.xml test
+ cleanup_before_cache_script: cleanup_maven_repository
+
plugin_qa_task:
depends_on:
- build
@@ -76,7 +82,7 @@ plugin_qa_task:
- SQ_VERSION: LATEST_RELEASE[7.9]
- SQ_VERSION: DOGFOOD
maven_cache:
- folder: $CIRRUS_WORKING_DIR/.m2/repository
+ folder: ${CIRRUS_WORKING_DIR}/.m2/repository
qa_script:
- source cirrus-env QA
- source set_maven_build_version $BUILD_NUMBER
@@ -99,6 +105,6 @@ promote_task:
#artifacts that will have downloadable links in burgr
ARTIFACTS: org.sonarsource.css:sonar-css-plugin:jar
maven_cache:
- folder: $CIRRUS_WORKING_DIR/.m2/repository
+ folder: ${CIRRUS_WORKING_DIR}/.m2/repository
script: cirrus_promote_maven
cleanup_before_cache_script: cleanup_maven_repository