diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-31 06:08:13 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-31 06:08:13 +0300 |
| commit | 25805c16335ed6466f0e475417e3005cd09848c2 (patch) | |
| tree | 59e83dff33c409d33b6cfac4c1bfd8e310eadb78 /.gitlab | |
| parent | 13ddda5208f9175e822af6d05a32600bc9cad091 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/caching.gitlab-ci.yml | 7 | ||||
| -rw-r--r-- | .gitlab/ci/frontend.gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | .gitlab/ci/global.gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | .gitlab/ci/memory.gitlab-ci.yml | 3 |
4 files changed, 11 insertions, 9 deletions
diff --git a/.gitlab/ci/caching.gitlab-ci.yml b/.gitlab/ci/caching.gitlab-ci.yml index fba2efc46e4..31975e481bc 100644 --- a/.gitlab/ci/caching.gitlab-ci.yml +++ b/.gitlab/ci/caching.gitlab-ci.yml @@ -47,10 +47,9 @@ cache-assets:test as-if-foss: - .as-if-foss cache-assets:production: - extends: .cache-assets-base - variables: - NODE_ENV: "production" - RAILS_ENV: "production" + extends: + - .cache-assets-base + - .production packages-cleanup: extends: diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index 0c9cdc28136..fb1b9dacb66 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -33,10 +33,8 @@ compile-production-assets: extends: - .compile-assets-base + - .production - .frontend:rules:compile-production-assets - variables: - NODE_ENV: "production" - RAILS_ENV: "production" artifacts: name: webpack-report expire_in: 31d diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml index 90f00c887f7..98ec3ce96a2 100644 --- a/.gitlab/ci/global.gitlab-ci.yml +++ b/.gitlab/ci/global.gitlab-ci.yml @@ -21,6 +21,12 @@ - !reference [.default-utils-before_script, before_script] - source scripts/prepare_build.sh +.production: + variables: + RAILS_ENV: "production" + NODE_ENV: "production" + GITLAB_ALLOW_SEPARATE_CI_DATABASE: "true" + .ruby-gems-cache: &ruby-gems-cache key: "ruby-gems-debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}" paths: diff --git a/.gitlab/ci/memory.gitlab-ci.yml b/.gitlab/ci/memory.gitlab-ci.yml index efdae0715aa..5d6b90d107d 100644 --- a/.gitlab/ci/memory.gitlab-ci.yml +++ b/.gitlab/ci/memory.gitlab-ci.yml @@ -19,12 +19,11 @@ memory-on-boot: extends: - .only-code-memory-job-base + - .production - .use-pg12 stage: test needs: ["setup-test-env", "compile-test-assets"] variables: - NODE_ENV: "production" - RAILS_ENV: "production" SETUP_DB: "true" MEMORY_ON_BOOT_FILE_PREFIX: "tmp/memory_on_boot_" TEST_COUNT: 5 |