Merge branch 'main' into poetry-1.5-lockfile

dependabot · Aug 4, 2023 · 814b985 · 814b985
2 parents 89e2ca0 + 2699b2b
commit 814b985
Show file tree

Hide file tree

Showing 172 changed files with 17,443 additions and 3,620 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -13,11 +13,10 @@
 /tmp
 **/.bundle
 **/coverage
-**/Gemfile.lock
+/Gemfile.lock
+*/Gemfile.lock
 !updater/Gemfile.lock
-!updater/spec/fixtures/**/Gemfile.lock
 **/node_modules
-!**/spec/fixtures/*
 git.store
 .DS_Store
 *.pyc

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -59,65 +59,75 @@ jobs:
  with:
  filters: |
  bundler:
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/Gemfil*'
  - 'omnibus/**'
  - '.github/workflows/ci.yml'
  - 'bundler/**'
  cargo:
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/Gemfil*'
  - 'omnibus/**'
  - '.github/workflows/ci.yml'
  - 'cargo/**'
  common:
+ - .dockerignore
  - Dockerfile.updater-core
  - '**/**'
  - '.github/workflows/ci.yml'
  composer:
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/Gemfil*'
  - 'omnibus/**'
  - '.github/workflows/ci.yml'
  - 'composer/**'
  docker:
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/Gemfil*'
  - 'omnibus/**'
  - '.github/workflows/ci.yml'
  - 'docker/**'
  elm:
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/Gemfil*'
  - 'omnibus/**'
  - '.github/workflows/ci.yml'
  - 'elm/**'
  git_submodules:
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/Gemfil*'
  - 'omnibus/**'
  - '.github/workflows/ci.yml'
  - 'git_submodules/**'
  github_actions:
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/Gemfil*'
  - 'omnibus/**'
  - '.github/workflows/ci.yml'
  - 'github_actions/**'
  go_modules:
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/Gemfil*'
  - 'go_modules/**'
  - '.github/workflows/ci.yml'
  gradle:
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/Gemfil*'
@@ -126,54 +136,62 @@ jobs:
  - 'maven/**'
  - 'gradle/**'
  hex:
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/Gemfil*'
  - 'omnibus/**'
  - '.github/workflows/ci.yml'
  - 'hex/**'
  maven:
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/Gemfil*'
  - 'maven/**'
  - '.github/workflows/ci.yml'
  npm_and_yarn:
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/Gemfil*'
  - 'omnibus/**'
  - '.github/workflows/ci.yml'
  - 'npm_and_yarn/**'
  nuget:
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/Gemfil*'
  - 'omnibus/**'
  - '.github/workflows/ci.yml'
  - 'nuget/**'
  pub:
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/Gemfil*'
  - 'omnibus/**'
  - '.github/workflows/ci.yml'
  - 'pub/**'
  python:
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/Gemfil*'
  - 'omnibus/**'
  - 'python/**'
  - '.github/workflows/ci.yml'
  swift:
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/Gemfil*'
  - 'omnibus/**'
  - 'swift/**'
  - '.github/workflows/ci.yml'
  terraform:
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/Gemfil*'

diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml
@@ -65,180 +65,210 @@ jobs:
  filters: |
  actions:
  - .github/workflows/smoke.yml
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/**'
  - 'github_actions/**'
  bundler:
  - .github/workflows/smoke.yml
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/**'
  - 'bundler/**'
  bundler-group-rules:
  - .github/workflows/smoke.yml
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/**'
  - 'bundler/**'
  cargo:
  - .github/workflows/smoke.yml
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/**'
  - 'cargo/**'
  composer:
  - .github/workflows/smoke.yml
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/**'
  - 'composer/**'
  docker:
  - .github/workflows/smoke.yml
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/**'
  - 'docker/**'
  elm:
  - .github/workflows/smoke.yml
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/**'
  - 'elm/**'
  go:
  - .github/workflows/smoke.yml
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/**'
  - 'go_modules/**'
  'go-close-pr':
  - .github/workflows/smoke.yml
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/**'
  - 'go_modules/**'
  'go-security':
  - .github/workflows/smoke.yml
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/**'
  - 'go_modules/**'
  'go-update-pr':
  - .github/workflows/smoke.yml
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/**'
  - 'go_modules/**'
  gradle:
  - .github/workflows/smoke.yml
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/**'
  - 'gradle/**'
  'gradle-version-catalog':
  - .github/workflows/smoke.yml
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/**'
  - 'gradle/**'
  hex:
  - .github/workflows/smoke.yml
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/**'
  - 'hex/**'
  maven:
  - .github/workflows/smoke.yml
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/**'
  - 'maven/**'
  npm:
  - .github/workflows/smoke.yml
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/**'
  - 'npm_and_yarn/**'
  'npm-remove-transitive':
  - .github/workflows/smoke.yml
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/**'
  - 'npm_and_yarn/**'
  nuget:
  - .github/workflows/smoke.yml
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/**'
  - 'nuget/**'
  pip:
  - .github/workflows/smoke.yml
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/**'
  - 'python/**'
  'pip-compile':
  - .github/workflows/smoke.yml
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/**'
  - 'python/**'
  pipenv:
  - .github/workflows/smoke.yml
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/**'
  - 'python/**'
  pnpm:
  - .github/workflows/smoke.yml
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/**'
  - 'npm_and_yarn/**'
  poetry:
  - .github/workflows/smoke.yml
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/**'
  - 'python/**'
  pub:
  - .github/workflows/smoke.yml
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/**'
  - 'pub/**'
  submodules:
  - .github/workflows/smoke.yml
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/**'
  - 'git_submodules/**'
  swift:
  - .github/workflows/smoke.yml
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/**'
  - 'swift/**'
  terraform:
  - .github/workflows/smoke.yml
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/**'
  - 'terraform/**'
  'yarn':
  - .github/workflows/smoke.yml
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/**'
  - 'npm_and_yarn/**'
  'yarn-berry':
  - .github/workflows/smoke.yml
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/**'
  - 'npm_and_yarn/**'
  'yarn-berry-workspaces':
  - .github/workflows/smoke.yml
+ - .dockerignore
  - Dockerfile.updater-core
  - 'common/**'
  - 'updater/**'

diff --git a/Dockerfile.updater-core b/Dockerfile.updater-core
@@ -94,10 +94,10 @@ WORKDIR $DEPENDABOT_HOME/dependabot-updater
 # When bumping Ruby minor, need to also add the previous version to `bundler/helpers/v{1,2}/monkey_patches/definition_ruby_version_patch.rb`
 COPY --from=ruby:3.1.4-bullseye --chown=dependabot:dependabot /usr/local /usr/local
 
-# When bumping Bundler, need to also regenerate `updater/Gemfile.lock` via `bundle update --bundler`
+# When bumping Bundler, need to also regenerate `updater/Gemfile.lock` via `bundle update --lock --bundler`
 # Generally simplest to match the bundler version to the one that comes by default with whatever Ruby version we install.
 # This way other projects that import this library don't have to futz around with installing new / unexpected bundler versions.
-ARG BUNDLER_V2_VERSION=2.4.14
+ARG BUNDLER_V2_VERSION=2.4.17
 
 # We had to explicitly bump this as the bundled version `0.2.2` in ubuntu 20.04 has a bug.
 # Once Ubuntu base image pulls in a new enough yaml version, we may not need to

diff --git a/bin/dry-run.rb b/bin/dry-run.rb
@@ -277,7 +277,7 @@ def show_diff(original_file, updated_file)
  removed_lines = diff.count { |line| line.start_with?("-") }
 
  puts
- puts " ± #{original_file.name}"
+ puts " ± #{original_file.realpath}"
  puts " ~~~"
  puts diff.map { |line| " " + line }.join
  puts " ~~~"

diff --git a/bundler/script/ci-test b/bundler/script/ci-test
@@ -3,7 +3,7 @@
 set -e
 
 bundle install
-bundle exec parallel_test spec/ -n "$CI_NODE_TOTAL" --only-group "$CI_NODE_INDEX" --group-by filesize --type rspec
+bundle exec parallel_test spec/ -n "$CI_NODE_TOTAL" --only-group "$CI_NODE_INDEX" --group-by filesize --type rspec --verbose
 
 # NOTE: Don't use `if` branches without `else` part, since the code in some of
 # then seems to not abort the script regardless of `set -e`