diff options
| author | Jeremy Davis <jeremy.davis@sonarsource.com> | 2024-12-03 17:08:22 +0100 |
|---|---|---|
| committer | Steve Marion <steve.marion@sonarsource.com> | 2024-12-18 11:13:23 +0100 |
| commit | 5f07343798c10a6e7b478f3500c23f655072fc45 (patch) | |
| tree | 1981ebf8bbb878509de137bcb0056f56240bf9da /.cirrus | |
| parent | 46b8d5813f2264efe04dea84225815ac26d7fe29 (diff) | |
| download | sonarqube-5f07343798c10a6e7b478f3500c23f655072fc45.tar.gz sonarqube-5f07343798c10a6e7b478f3500c23f655072fc45.zip | |
SONAR-23605 Fix config and add missing files
Diffstat (limited to '.cirrus')
| -rw-r--r-- | .cirrus/.cirrus.yml | 68 | ||||
| -rwxr-xr-x | .cirrus/cirrus-yarn-lint-report.sh | 7 | ||||
| -rwxr-xr-x | .cirrus/cirrus-yarn-validate-ci.sh | 7 |
3 files changed, 0 insertions, 82 deletions
diff --git a/.cirrus/.cirrus.yml b/.cirrus/.cirrus.yml index 919d14deeb8..7ec4d710d35 100644 --- a/.cirrus/.cirrus.yml +++ b/.cirrus/.cirrus.yml @@ -44,28 +44,11 @@ cleanup_gradle_cache_script_template: &CLEANUP_GRADLE_CACHE_SCRIPT rm -rf "${GRADLE_USER_HOME}"/caches/journal-* /usr/bin/find "${GRADLE_USER_HOME}"/caches/ -name "*.lock" -type f -delete -yarn_cache_template: &YARN_CACHE_TEMPLATE - yarn_cache: - folder: '~/.yarn/berry/cache' - fingerprint_script: cat server/sonar-web/yarn.lock - jar_cache_template: &JAR_CACHE_TEMPLATE jar_cache: folder: '**/build/libs/*.jar' fingerprint_key: jar-cache_$CIRRUS_BUILD_ID -eslint_report_cache_template: &ESLINT_REPORT_CACHE_TEMPLATE - eslint_report_cache: - folders: - - server/sonar-web/eslint-report/ - fingerprint_script: echo $CIRRUS_BUILD_ID - -jest_report_cache_template: &JEST_REPORT_CACHE_TEMPLATE - jest_report_cache: - folders: - - server/sonar-web/coverage/ - fingerprint_script: echo $CIRRUS_BUILD_ID - junit_report_cache_template: &JUNIT_REPORT_CACHE_TEMPLATE junit_report_cache: folders: @@ -100,57 +83,11 @@ build_task: <<: *DEFAULT_TEMPLATE <<: *GRADLE_CACHE_TEMPLATE <<: *BUILD_CACHE_TEMPLATE - <<: *YARN_CACHE_TEMPLATE <<: *JAR_CACHE_TEMPLATE script: .cirrus/cirrus-build.sh <<: *CLEANUP_GRADLE_CACHE_SCRIPT <<: *DEFAULT_ARTIFACTS_TEMPLATE -yarn_lint_task: - depends_on: cache_dependencies - container: - dockerfile: .cirrus/Dockerfile - cpu: 3 - memory: 10Gb - <<: *DEFAULT_TEMPLATE - <<: *GRADLE_CACHE_TEMPLATE - <<: *YARN_CACHE_TEMPLATE - <<: *ESLINT_REPORT_CACHE_TEMPLATE - script: - - .cirrus/cirrus-yarn-lint-report.sh - <<: *CLEANUP_GRADLE_CACHE_SCRIPT - <<: *DEFAULT_ARTIFACTS_TEMPLATE - -yarn_check_task: - depends_on: cache_dependencies - container: - dockerfile: .cirrus/Dockerfile - cpu: 3 - memory: 10Gb - <<: *DEFAULT_TEMPLATE - <<: *GRADLE_CACHE_TEMPLATE - <<: *YARN_CACHE_TEMPLATE - script: | - source .cirrus/cirrus-env - ./gradlew yarn_check-ci - <<: *CLEANUP_GRADLE_CACHE_SCRIPT - <<: *DEFAULT_ARTIFACTS_TEMPLATE - -yarn_validate_task: - depends_on: cache_dependencies - container: - dockerfile: .cirrus/Dockerfile - cpu: 8 - memory: 32Gb - <<: *DEFAULT_TEMPLATE - <<: *GRADLE_CACHE_TEMPLATE - <<: *YARN_CACHE_TEMPLATE - <<: *JEST_REPORT_CACHE_TEMPLATE - script: - - .cirrus/cirrus-yarn-validate-ci.sh - <<: *CLEANUP_GRADLE_CACHE_SCRIPT - <<: *DEFAULT_ARTIFACTS_TEMPLATE - junit_task: depends_on: cache_dependencies container: @@ -168,8 +105,6 @@ junit_task: sq_analysis_task: depends_on: - build - - yarn_lint - - yarn_validate - junit container: dockerfile: .cirrus/Dockerfile @@ -180,9 +115,6 @@ sq_analysis_task: SONAR_TOKEN: ENCRYPTED[!b6fd814826c51e64ee61b0b6f3ae621551f6413383f7170f73580e2e141ac78c4b134b506f6288c74faa0dd564c05a29!] <<: *GRADLE_CACHE_TEMPLATE <<: *BUILD_CACHE_TEMPLATE - <<: *YARN_CACHE_TEMPLATE - <<: *JEST_REPORT_CACHE_TEMPLATE - <<: *ESLINT_REPORT_CACHE_TEMPLATE <<: *JUNIT_REPORT_CACHE_TEMPLATE script: - .cirrus/cirrus-sq-analysis.sh diff --git a/.cirrus/cirrus-yarn-lint-report.sh b/.cirrus/cirrus-yarn-lint-report.sh deleted file mode 100755 index e6f32e50ae6..00000000000 --- a/.cirrus/cirrus-yarn-lint-report.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -euo pipefail - -source .cirrus/cirrus-env - -./gradlew yarn_lint-report-ci \ - --parallel --configure-on-demand --console plain -Pqa diff --git a/.cirrus/cirrus-yarn-validate-ci.sh b/.cirrus/cirrus-yarn-validate-ci.sh deleted file mode 100755 index b3884ed5e2e..00000000000 --- a/.cirrus/cirrus-yarn-validate-ci.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -euo pipefail - -source .cirrus/cirrus-env - -./gradlew yarn_validate-ci \ - --parallel --configure-on-demand --console plain -Pqa |