diff options
| author | Evan Read <eread@gitlab.com> | 2023-02-15 02:27:22 +0300 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2023-02-15 02:27:22 +0300 |
| commit | 9311139d1f285e5ce84ae6345ccaebd8c50000ab (patch) | |
| tree | 08df58bfddb491bc4f29fe0be785d7d6ddef5d5d | |
| parent | fee9465af4a94bec07aa14df7a0cf4021687c21d (diff) | |
| parent | 03b2a0d8ed14a0c52356684319b1efef01e6b98c (diff) | |
Merge branch 'axil-bundle-jobs' into 'main'
Use the default jobs to run by bundle
See merge request https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/3543
Merged-by: Evan Read <eread@gitlab.com>
Approved-by: Evan Read <eread@gitlab.com>
Co-authored-by: Achilleas Pipinellis <axil@gitlab.com>
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | dockerfiles/gitlab-docs-lint-html.Dockerfile | 2 | ||||
| -rw-r--r-- | dockerfiles/single.Dockerfile | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 4c37aab1..8b47e5ac 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -13,7 +13,7 @@ default: - gem --version - bundle --version - bundle config set --local deployment true # Install dependencies into ./vendor/bundle - - bundle install --jobs 4 + - bundle install cache: key: files: @@ -27,7 +27,7 @@ default: - gem --version - bundle --version - bundle config set --local deployment true # Install dependencies into ./vendor/bundle - - bundle install --jobs 4 + - bundle install - node --version - yarn --version - yarn install --frozen-lockfile --cache-folder .yarn-cache diff --git a/dockerfiles/gitlab-docs-lint-html.Dockerfile b/dockerfiles/gitlab-docs-lint-html.Dockerfile index cc8745c8..c4a491a6 100644 --- a/dockerfiles/gitlab-docs-lint-html.Dockerfile +++ b/dockerfiles/gitlab-docs-lint-html.Dockerfile @@ -52,4 +52,4 @@ RUN printf "\n\e[32mINFO: Installing Node.js and Ruby dependencies..\e[39m\n" \ && yarn install --frozen-lockfile \ && yarn cache clean --all \ && bundle update --bundler \ - && bundle install --jobs 4 + && bundle install diff --git a/dockerfiles/single.Dockerfile b/dockerfiles/single.Dockerfile index dc9c2e31..bf3c55bf 100644 --- a/dockerfiles/single.Dockerfile +++ b/dockerfiles/single.Dockerfile @@ -75,7 +75,7 @@ WORKDIR /source RUN yarn install --frozen-lockfile \ && yarn cache clean \ && bundle config set --local deployment true \ - && bundle install --jobs 4 \ + && bundle install \ && bundle exec rake default \ && bundle exec nanoc compile -VV |