From 048b95640efc2930b14831ed5efb8f82b4930cd2 Mon Sep 17 00:00:00 2001 From: julien mounier Date: Tue, 12 Dec 2023 10:37:21 +0100 Subject: [PATCH 1/3] maint(ci): bump included gitlab-ci files to latest + include cache helper --- .gitlab-ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b7d8b4f3..ffa97b07 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,10 @@ include: - project: TankerHQ/gitlab-ci-files file: /common.yml - ref: 2021-12-16-236 + ref: 2023-08-25-271 + - project: TankerHQ/gitlab-ci-files + file: /cache.yml + ref: 2023-12-12-275 variables: GIT_DEPTH: 1 From 8987bfb21c4d86b69857db29d66dc59fe526be1c Mon Sep 17 00:00:00 2001 From: julien mounier Date: Tue, 12 Dec 2023 10:41:25 +0100 Subject: [PATCH 2/3] feat(ci): override default npm cache for jobs on docker base runners Use the persested cache volume instead of the default $HOME based caches --- .gitlab-ci.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ffa97b07..69743998 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,11 +21,14 @@ default: - poetry -V - node -v - npm --version + - npm config list -l | grep cache - poetry install --sync - poetry run python --version check/lint: stage: check + extends: + - .npm-cache rules: - !reference [.rules/mr/auto, rules] - !reference [.rules/web/auto, rules] @@ -41,6 +44,8 @@ check/lint: check/linux/chrome: stage: check + extends: + - .npm-cache rules: - !reference [.rules/mr/auto, rules] - !reference [.rules/web/auto, rules] @@ -51,6 +56,8 @@ check/linux/chrome: .check/linux/node-base: stage: check + extends: + - .npm-cache script: - /usr/local/nvm/nvm-exec poetry run python run-ci.py check --runner node - mv coverage/lcov-report lcov-report @@ -119,6 +126,7 @@ check/windows/edge: check/linux/nightly: extends: + - .npm-cache - .rules/nightly stage: check script: @@ -235,6 +243,8 @@ bridge/compat: check/e2e: stage: check + extends: + - .npm-cache rules: - !reference [.rules/mr/manual, rules] - !reference [.rules/nightly, rules] @@ -245,6 +255,7 @@ check/e2e: audit: extends: + - .npm-cache - .rules/nightly stage: check script: @@ -269,6 +280,7 @@ test/deployed: needs: - deploy extends: + - .npm-cache - .rules/deploy/js script: - poetry run python run-ci.py test-deploy --version "${SDK_JS_RELEASE_VERSION}" From 0a405e536193916b4083c7de20d214289b6e0615 Mon Sep 17 00:00:00 2001 From: julien mounier Date: Tue, 12 Dec 2023 10:42:50 +0100 Subject: [PATCH 3/3] misc(ci): apply auto format --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 69743998..40c7ba37 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -155,8 +155,7 @@ check/bridge-dotenv: before_script: - poetry install --sync script: - - poetry run python run-ci.py write-bridge-dotenv --downstream benchmarks - --downstream compatibility-tests + - poetry run python run-ci.py write-bridge-dotenv --downstream benchmarks --downstream compatibility-tests rules: # Other jobs cannot "needs" this once if the rules don't match - !reference [.rules/mr/auto, rules] - !reference [.rules/web/auto, rules]