diff options
author | Achilleas Pipinellis <axil@gitlab.com> | 2022-10-06 00:18:05 +0300 |
---|---|---|
committer | Achilleas Pipinellis <axil@gitlab.com> | 2022-10-06 00:18:05 +0300 |
commit | d30557b0e8074679c360c81506014aec7620ffe8 (patch) | |
tree | 2402b6cbd00b700400f67b74ae85d5778c246ef0 | |
parent | ff2c739b8d914ccec43252ba5c35036191b647a3 (diff) | |
parent | 922b57351db296f41e0151681ae2896869982421 (diff) |
Merge branch 'cleanup-tasks' into 'main'
Remove `setup_git` task
See merge request https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/3095
Merged-by: Achilleas Pipinellis <axil@gitlab.com>
Approved-by: Achilleas Pipinellis <axil@gitlab.com>
Co-authored-by: Anatoli Babenia <anatoli@rainforce.org>
-rw-r--r-- | .gitlab/ci/build-and-deploy.gitlab-ci.yml | 2 | ||||
-rw-r--r-- | .gitlab/ci/test.gitlab-ci.yml | 4 | ||||
-rw-r--r-- | dockerfiles/builder.onbuild.Dockerfile | 2 | ||||
-rw-r--r-- | dockerfiles/single.Dockerfile | 2 | ||||
-rw-r--r-- | latest.Dockerfile | 2 | ||||
-rw-r--r-- | lib/tasks/build_site.rake | 7 |
6 files changed, 6 insertions, 13 deletions
diff --git a/.gitlab/ci/build-and-deploy.gitlab-ci.yml b/.gitlab/ci/build-and-deploy.gitlab-ci.yml index 7cbf976f..327aa6f3 100644 --- a/.gitlab/ci/build-and-deploy.gitlab-ci.yml +++ b/.gitlab/ci/build-and-deploy.gitlab-ci.yml @@ -8,7 +8,7 @@ - .retry - .bundle_and_yarn script: - - bundle exec rake setup_git default + - bundle exec rake default - bundle exec nanoc compile -VV # Create _redirects for Pages redirects - bundle exec rake redirects diff --git a/.gitlab/ci/test.gitlab-ci.yml b/.gitlab/ci/test.gitlab-ci.yml index 3904f11b..b1c30972 100644 --- a/.gitlab/ci/test.gitlab-ci.yml +++ b/.gitlab/ci/test.gitlab-ci.yml @@ -147,7 +147,7 @@ test_EOL_whitespace: - apk add jq - bundle config set --local deployment true # Install dependencies into ./vendor/ruby - bundle install - - bundle exec rake setup_git default + - bundle exec rake default - markdownlint --config tasks/whitespace_task.yml '../gitlab/doc/**/*.md' '../gitlab-runner/doc/**/*.md' '../omnibus-gitlab/doc/**/*.md' '../charts-gitlab/doc/**/*.md' '../gitlab-operator/doc/**/*.md' test_unlinked_images: @@ -163,7 +163,7 @@ test_unlinked_images: - apk add jq - bundle config set --local deployment true # Install dependencies into ./vendor/ruby - bundle install - - bundle exec rake setup_git default + - bundle exec rake default - cp tasks/unlinked-images.sh ../gitlab/unlinked-images.sh - cp tasks/unlinked-images.sh ../charts-gitlab/unlinked-images.sh - cp tasks/unlinked-images.sh ../omnibus-gitlab/unlinked-images.sh diff --git a/dockerfiles/builder.onbuild.Dockerfile b/dockerfiles/builder.onbuild.Dockerfile index 400b9fd6..e2e1aff1 100644 --- a/dockerfiles/builder.onbuild.Dockerfile +++ b/dockerfiles/builder.onbuild.Dockerfile @@ -10,7 +10,7 @@ ONBUILD ARG CI_COMMIT_REF_NAME ONBUILD COPY . /source/ ONBUILD RUN NOKOGIRI_USE_SYSTEM_LIBRARIES=1 bundle install --jobs 4 ONBUILD RUN yarn install && yarn cache clean -ONBUILD RUN bundle exec rake setup_git default +ONBUILD RUN bundle exec rake default ONBUILD RUN bundle exec nanoc compile -VV ## For 13.9 and later, there's a raketask that is run instead of the ## manual READMEs symlinking that is defined in scripts/normalize-links.sh. diff --git a/dockerfiles/single.Dockerfile b/dockerfiles/single.Dockerfile index d32e8537..49c58393 100644 --- a/dockerfiles/single.Dockerfile +++ b/dockerfiles/single.Dockerfile @@ -75,7 +75,7 @@ RUN yarn install --frozen-lockfile \ && yarn cache clean \ && bundle config set --local deployment true \ && bundle install --jobs 4 \ - && bundle exec rake setup_git default \ + && bundle exec rake default \ && bundle exec nanoc compile -VV # Move generated HTML to /site diff --git a/latest.Dockerfile b/latest.Dockerfile index 77dcecfd..0db96e48 100644 --- a/latest.Dockerfile +++ b/latest.Dockerfile @@ -17,7 +17,7 @@ ENV CI_COMMIT_REF_NAME ${CI_COMMIT_REF_NAME:-main} COPY . /source/ RUN yarn install && \ bundle install && \ - bundle exec rake setup_git default && \ + bundle exec rake default && \ bundle exec nanoc compile -VV && \ /scripts/compress_images.sh /source/public ee # compress images diff --git a/lib/tasks/build_site.rake b/lib/tasks/build_site.rake index 75e31120..7b831b57 100644 --- a/lib/tasks/build_site.rake +++ b/lib/tasks/build_site.rake @@ -8,13 +8,6 @@ task_helpers = TaskHelpers.new task default: [:clone_repositories, :generate_feature_flags] -task :setup_git do - puts "\n#{TaskHelpers::COLOR_CODE_GREEN}INFO: Setting up dummy user and email in Git..#{TaskHelpers::COLOR_CODE_RESET}" - - `git config --global user.name "Sidney Jones"` - `git config --global user.email "sidneyjones@example.com"` -end - desc 'Clone Git repositories of documentation projects, keeping only the most recent commit' task :clone_repositories do task_helpers.products.each_value do |product| |