diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-07-23 13:35:41 +0000 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-07-23 13:35:41 +0000 |
commit | 76d3b35cb6082d44188cb1c61d1bff0335e6646d (patch) | |
tree | 5413ab5fa054c3f06e3c7eecc47d29deab7df9cd /.gitlab | |
parent | fcb09f0f4a3cf7cceec48dbae1e8f4bec04b9469 (diff) | |
parent | 6c97f9f5ec1f8c59ebcaf6bf8a71432e89a1d993 (diff) | |
download | gitlab-ce-76d3b35cb6082d44188cb1c61d1bff0335e6646d.tar.gz |
Merge branch 'sh-enable-bootsnap' into 'master'
Make Bootsnap available via ENABLE_BOOTSNAP=1
Closes #45230
See merge request gitlab-org/gitlab-ce!30963
Diffstat (limited to '.gitlab')
-rw-r--r-- | .gitlab/ci/memory.gitlab-ci.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab/ci/memory.gitlab-ci.yml b/.gitlab/ci/memory.gitlab-ci.yml index ffe5dbdc31b..9923732e587 100644 --- a/.gitlab/ci/memory.gitlab-ci.yml +++ b/.gitlab/ci/memory.gitlab-ci.yml @@ -33,7 +33,7 @@ memory-on-boot: NODE_OPTIONS: --max_old_space_size=3584 script: # Both bootsnap and derailed monkey-patch Kernel#require, which leads to circular dependency - - DISABLE_BOOTSNAP=true PATH_TO_HIT="/users/sign_in" CUT_OFF=0.3 bundle exec derailed exec perf:mem >> 'tmp/memory_on_boot.txt' + - ENABLE_BOOTSNAP=false PATH_TO_HIT="/users/sign_in" CUT_OFF=0.3 bundle exec derailed exec perf:mem >> 'tmp/memory_on_boot.txt' - scripts/generate-memory-metrics-on-boot tmp/memory_on_boot.txt >> 'tmp/memory_on_boot_metrics.txt' artifacts: paths: |