Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-docs.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Amirault <mamirault@gitlab.com>2023-07-18 14:33:11 +0300
committerMarcel Amirault <mamirault@gitlab.com>2023-07-18 14:33:11 +0300
commit52fda4748687bdf38acd7285500401723efa4743 (patch)
tree17df7d4cb4c10c76e2136575bd0a41ba65205ff5
parent036dcc8a334f7b26fcbb5767ece33a09c59abe60 (diff)
parent205d9706ab1bb513e58638efc9697a3756a3f2ff (diff)
Merge branch '1677-cache-gems' into 'main'
Install Gems to vendor/bundle Closes #1677 See merge request https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/4067 Merged-by: Marcel Amirault <mamirault@gitlab.com> Approved-by: Marcel Amirault <mamirault@gitlab.com> Co-authored-by: Sarah German <sgerman@gitlab.com>
-rw-r--r--.gitlab/ci/rules.gitlab-ci.yml4
-rw-r--r--.gitlab/ci/test.gitlab-ci.yml4
-rw-r--r--dockerfiles/single.Dockerfile12
3 files changed, 10 insertions, 10 deletions
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index 725f8909..e8f4b9c8 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -12,7 +12,7 @@ default:
- ruby --version
- gem --version
- bundle --version
- - bundle config set --local deployment true # Install dependencies into ./vendor/bundle
+ - bundle config set --local path 'vendor/bundle' # Install dependencies into ./vendor/bundle
- bundle install
cache:
key:
@@ -26,7 +26,7 @@ default:
- ruby --version
- gem --version
- bundle --version
- - bundle config set --local deployment true # Install dependencies into ./vendor/bundle
+ - bundle config set --local path 'vendor/bundle' # Install dependencies into ./vendor/bundle
- bundle install
- node --version
- yarn --version
diff --git a/.gitlab/ci/test.gitlab-ci.yml b/.gitlab/ci/test.gitlab-ci.yml
index b3ef39a6..6ca9ec81 100644
--- a/.gitlab/ci/test.gitlab-ci.yml
+++ b/.gitlab/ci/test.gitlab-ci.yml
@@ -199,7 +199,7 @@ test_EOL_whitespace:
dependencies: []
script:
- apk add jq
- - bundle config set --local deployment true # Install dependencies into ./vendor/ruby
+ - bundle config set --local path 'vendor/bundle' # Install dependencies into ./vendor/bundle
- bundle install
- bundle exec rake default
- yarn global add markdownlint-cli2
@@ -216,7 +216,7 @@ test_unlinked_images:
dependencies: []
script:
- apk add jq
- - bundle config set --local deployment true # Install dependencies into ./vendor/ruby
+ - bundle config set --local path 'vendor/bundle' # Install dependencies into ./vendor/bundle
- bundle install
- bundle exec rake default
- cp tasks/unlinked-images.sh ../gitlab/unlinked-images.sh
diff --git a/dockerfiles/single.Dockerfile b/dockerfiles/single.Dockerfile
index 0ba7878a..62b55978 100644
--- a/dockerfiles/single.Dockerfile
+++ b/dockerfiles/single.Dockerfile
@@ -52,12 +52,12 @@ RUN apk add --no-cache -U \
COPY . /source/
WORKDIR /source
-RUN yarn install --frozen-lockfile \
- && yarn cache clean \
- && bundle config set --local deployment true \
- && bundle install \
- && bundle exec rake default \
- && bundle exec nanoc compile -VV \
+RUN yarn install --frozen-lockfile \
+ && yarn cache clean \
+ && bundle config set --local path 'vendor/bundle' \
+ && bundle install \
+ && bundle exec rake default \
+ && bundle exec nanoc compile -VV \
&& yarn compile:css
RUN if [ "$SEARCH_BACKEND" = "lunr" ]; then make build-lunr-index; fi