diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6dafa32..cca372d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,15 +21,13 @@ variables: HOMEBREW_CACHE: "${CI_PROJECT_DIR}/tmp/Homebrew" # Cached directories shared between jobs & pipelines per-branch per-runner -cache: &global_cache +cache: key: $CI_COMMIT_REF_SLUG paths: - ./tmp/npm/ - ./tmp/ts-node-cache/ # Homebrew cache is only used by the macos runner - ./tmp/Homebrew - # Chocolatey cache is only used by the windows runner - - ./tmp/choco # `jest` cache is configured in jest.config.js - ./tmp/jest/ @@ -123,7 +121,6 @@ build:windows: tags: - windows before_script: - - choco config set cacheLocation "${env:CI_PROJECT_DIR}\tmp\choco" - choco install nodejs --version=16.14.2 -y - choco install python --version=3.9.12 -y - refreshenv @@ -298,12 +295,6 @@ integration:macos: tags: - shared-macos-amd64 image: macos-11-xcode-12 - variables: - HOMEBREW_CACHE: "${CI_PROJECT_DIR}/tmp/Homebrew" - cache: - key: $CI_COMMIT_REF_SLUG - paths: - - ./tmp/Homebrew script: - for f in ./builds/*-macos-x64*; do "$f"; done rules: