diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 307edb593df22c11db6c77145c906ee5799789d2..46b365852b1a06c4a4210d497b283d421f15c101 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,9 +25,15 @@ install_dependencies: script: - corepack enable - yarn install --immutable --check-cache - # only: - # changes: - # - yarn.lock + rules: + # always run when triggered manually + - if: $CI_COMMIT_BRANCH && $CI_PIPELINE_SOURCE == "web" + when: on_success + # only run on specific file changes when triggered by git push + - if: $CI_COMMIT_BRANCH + changes: + - package.json + - yarn.lock interruptible: true test: @@ -87,14 +93,16 @@ staging_deploy: extends: .deploy variables: ENVIRONMENT_ID: 'staging' - only: - - main + rules: + - if: $CI_COMMIT_BRANCH == "main" + when: on_success resource_group: staging production_deploy: extends: .deploy variables: ENVIRONMENT_ID: 'production' - only: - - production + rules: + - if: $CI_COMMIT_BRANCH == "production" + when: on_success resource_group: production diff --git a/terraform/common/init.tf b/terraform/common/init.tf index 47b138e5a57f18bccb726cce59acc1a909f4ef96..cb1cac74e95d890371568f527768ba8ccd294927 100644 --- a/terraform/common/init.tf +++ b/terraform/common/init.tf @@ -4,11 +4,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = "6.25.0" + version = "6.26.0" } google-beta = { source = "hashicorp/google-beta" - version = "6.25.0" + version = "6.26.0" } } backend "gcs" { diff --git a/terraform/environments/init.tf b/terraform/environments/init.tf index 736c2491cd1425dc096ed4fb3ec33c8939dc126d..98c8c1571d8e0f96e0cbd06d8f38581c560fe9aa 100644 --- a/terraform/environments/init.tf +++ b/terraform/environments/init.tf @@ -4,11 +4,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = "6.25.0" + version = "6.26.0" } google-beta = { source = "hashicorp/google-beta" - version = "6.25.0" + version = "6.26.0" } } backend "gcs" { diff --git a/yarn.lock b/yarn.lock index 7c0c6181408bf04f09cbdd8c323bb98a739fcbe7..e0fbd52bf88dbab3d33fa119b6734c828d29f7bb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1002,11 +1002,11 @@ __metadata: linkType: hard "@types/node@npm:*, @types/node@npm:^22.0.0": - version: 22.13.10 - resolution: "@types/node@npm:22.13.10" + version: 22.13.13 + resolution: "@types/node@npm:22.13.13" dependencies: undici-types: "npm:~6.20.0" - checksum: 10c0/a3865f9503d6f718002374f7b87efaadfae62faa499c1a33b12c527cfb9fd86f733e1a1b026b80c5a0e4a965701174bc3305595a7d36078aa1abcf09daa5dee9 + checksum: 10c0/daf792ba5dcff1316abf4b33680f94b792f8d54d6ae495efc8929531e0ba1284a248d29aab117d2259f9280284d986ad5799b193b0516e2b926d713aab835f7d languageName: node linkType: hard @@ -1279,13 +1279,13 @@ __metadata: linkType: hard "axios@npm:^1.3.4": - version: 1.8.3 - resolution: "axios@npm:1.8.3" + version: 1.8.4 + resolution: "axios@npm:1.8.4" dependencies: follow-redirects: "npm:^1.15.6" form-data: "npm:^4.0.0" proxy-from-env: "npm:^1.1.0" - checksum: 10c0/de75da9859adf0a6481d4af2b687db357a054d20f0d69b99d502b71dae3578326b1fdc0951dabaef769827484941cda93d3f89150bf9e04f05f6615fb8316780 + checksum: 10c0/450993c2ba975ffccaf0d480b68839a3b2435a5469a71fa2fb0b8a55cdb2c2ae47e609360b9c1e2b2534b73dfd69e2733a1cf9f8215bee0bcd729b72f801b0ce languageName: node linkType: hard @@ -4263,8 +4263,8 @@ __metadata: linkType: hard "pg@npm:^8.4.0": - version: 8.14.0 - resolution: "pg@npm:8.14.0" + version: 8.14.1 + resolution: "pg@npm:8.14.1" dependencies: pg-cloudflare: "npm:^1.1.1" pg-connection-string: "npm:^2.7.0" @@ -4280,7 +4280,7 @@ __metadata: peerDependenciesMeta: pg-native: optional: true - checksum: 10c0/14d9fe726189107b028d5603b299776d039e36ed657c99057bcc1c125f889cb46536e0c48c6d98952231733c788f98c631bf74d5f8c9cbf85c4ac7c0a119b8b4 + checksum: 10c0/221741cfcea4ab32c8b57bd60703bc36cfb5622dcac56c19e45f504ef8669f2f2e0429af8850f58079cfc89055da35b5a5e12de19e0505e3f61a4b4349388dcb languageName: node linkType: hard @@ -5221,8 +5221,8 @@ __metadata: linkType: hard "ts-jest@npm:^29.1.0": - version: 29.2.6 - resolution: "ts-jest@npm:29.2.6" + version: 29.3.0 + resolution: "ts-jest@npm:29.3.0" dependencies: bs-logger: "npm:^0.2.6" ejs: "npm:^3.1.10" @@ -5232,6 +5232,7 @@ __metadata: lodash.memoize: "npm:^4.1.2" make-error: "npm:^1.3.6" semver: "npm:^7.7.1" + type-fest: "npm:^4.37.0" yargs-parser: "npm:^21.1.1" peerDependencies: "@babel/core": ">=7.0.0-beta.0 <8" @@ -5253,7 +5254,7 @@ __metadata: optional: true bin: ts-jest: cli.js - checksum: 10c0/2a79bdb2631bbd004cd6ec171d62dc3681b86e7d1c20eece7f56e7c3df11a0f5a14f4831960b1ba8d1836787395c8f9dcbd084fd7f59246bbee8048feb93f892 + checksum: 10c0/c6a6b80e056a6d78679307fc859ebaafa9809bd707e5679b4f3e75b774137d840e607401698059e98497dac299c8c90305eae7ae8464cb1c6f161edfa8de0903 languageName: node linkType: hard @@ -5323,6 +5324,13 @@ __metadata: languageName: node linkType: hard +"type-fest@npm:^4.37.0": + version: 4.37.0 + resolution: "type-fest@npm:4.37.0" + checksum: 10c0/5bad189f66fbe3431e5d36befa08cab6010e56be68b7467530b7ef94c3cf81ef775a8ac3047c8bbda4dd3159929285870357498d7bc1df062714f9c5c3a84926 + languageName: node + linkType: hard + "type-is@npm:~1.6.18": version: 1.6.18 resolution: "type-is@npm:1.6.18"