Merge branch 'master' into fix-bundle-plugin-bug

Author: dfop02

.githooks/pre-commit-rubocop

@@ -5,7 +5,7 @@ length=${#files}
 
 # Run rubocop hook only when analyzable files are present
 if [[ $length -ne 0 ]]; then
-  ./util/rubocop $files
+  ./bin/rubocop $files
 else
   echo "No files to analyze"
 fi

.github/workflows/bundler.yml

@@ -14,7 +14,6 @@ permissions:  # added using https://github.com/step-security/secure-workflows
 defaults:
   run:
     shell: bash
-    working-directory: ./bundler
 
 jobs:
   bundler:
@@ -76,4 +75,5 @@ jobs:
       - name: Run Test
         run: |
           bin/parallel_rspec
+        working-directory: ./bundler
     timeout-minutes: ${{ matrix.timeout || 60 }}

.github/workflows/daily-bundler.yml

@@ -10,7 +10,6 @@ permissions:
 defaults:
   run:
     shell: bash
-    working-directory: ./bundler
 
 jobs:
   daily_bundler:
@@ -39,7 +38,6 @@ jobs:
       - name: Run Test
         run: |
           bin/rake spec:all
-
       - name: Get previous status
         if: always()
         run: echo "OLD_STATUS=$(curl -sS 'https://api.github.com/repos/rubygems/rubygems/actions/workflows/daily-bundler.yml/runs?event=schedule&branch=master' | jq '.workflow_runs | .[1].conclusion')" >> $GITHUB_ENV

.github/workflows/jruby-bundler.yml

@@ -14,7 +14,6 @@ permissions:  # added using https://github.com/step-security/secure-workflows
 defaults:
   run:
     shell: bash
-    working-directory: ./bundler
 
 jobs:
   jruby_bundler:
@@ -48,10 +47,11 @@ jobs:
       - name: Run Test
         run: |
           bin/parallel_rspec --tag jruby_only --tag jruby
+        working-directory: ./bundler
         if: startsWith(matrix.os.name, 'ubuntu')
       - name: Install local bundler
         run: |
-          bin/rake install:local
+          bin/rake bundler:install:local
         if: startsWith(matrix.os.name, 'ubuntu')
       - name: Run a warbler project
         run: |

.github/workflows/realworld-bundler.yml

@@ -52,14 +52,11 @@ jobs:
           bundler: none
       - name: Prepare dependencies
         run: bin/rake spec:deps
-        working-directory: ./bundler
       - name: Replace version
         run: BUNDLER_SPEC_SUB_VERSION=${{ matrix.bundler.value }} bin/rake override_version
         if: matrix.bundler.value != ''
-        working-directory: ./bundler
       - name: Run Test
         run: bin/rake spec:realworld
-        working-directory: ./bundler
       - name: Upload used cassettes as artifact
         uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
         with:
@@ -92,14 +89,11 @@ jobs:
           bundler: none
       - name: Prepare dependencies
         run: bin/rake spec:deps
-        working-directory: ./bundler
       - name: Replace version
         run: BUNDLER_SPEC_SUB_VERSION=${{ matrix.bundler.value }} bin/rake override_version
         if: matrix.bundler.value != ''
-        working-directory: ./bundler
       - name: Run Test
         run: bin/rake spec:realworld
-        working-directory: ./bundler
       - name: Upload used cassettes as artifact
         uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
         with:
@@ -124,4 +118,3 @@ jobs:
           path: ./bundler/spec/support/artifice/used_vcr_cassettes
       - name: Check unused cassettes
         run: bin/rake spec:realworld:check_unused_cassettes
-        working-directory: ./bundler

.github/workflows/scorecards.yml

@@ -49,6 +49,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@29b1f65c5e92e24fe6b6647da1eaabe529cec70f # v2.3.3
+        uses: github/codeql-action/upload-sarif@83f0fe6c4988d98a455712a27f0255212bba9bd4 # v2.3.6
         with:
           sarif_file: results.sarif

.github/workflows/system-rubygems-bundler.yml

@@ -23,7 +23,6 @@ permissions:  # added using https://github.com/step-security/secure-workflows
 defaults:
   run:
     shell: bash
-    working-directory: ./bundler
 
 jobs:
   system_rubygems_bundler:
@@ -61,6 +60,7 @@ jobs:
       - name: Run Test
         run: |
           bin/parallel_rspec
+        working-directory: ./bundler
       - name: Save system RubyGems version to ENV
         run: |
           RGV=$(ruby -e 'puts Gem::VERSION.split(".")[0..2].join(".")')

.github/workflows/truffleruby-bundler.yml

@@ -14,7 +14,6 @@ permissions:  # added using https://github.com/step-security/secure-workflows
 defaults:
   run:
     shell: bash
-    working-directory: ./bundler
 
 jobs:
   truffleruby_bundler:
@@ -34,4 +33,5 @@ jobs:
       - name: Run Test
         run: |
           bin/parallel_rspec --tag truffleruby_only --tag truffleruby
+        working-directory: ./bundler
     timeout-minutes: 20

.github/workflows/ubuntu-lint.yml

@@ -32,8 +32,6 @@ jobs:
         run: rake docs
       - name: Install & Check Dependencies
         run: bin/rake dev:frozen_deps
-        working-directory: ./bundler
       - name: Misc checks
         run: bin/rake check_rvm_integration man:check check_rubygems_integration
-        working-directory: ./bundler
     timeout-minutes: 15

.rubocop.yml

@@ -39,7 +39,7 @@ Naming/VariableNumber:
   Exclude:
     - lib/**/*
     - test/**/*
-    - util/**/*
+    - tool/**/*
 
 # Performance
 
@@ -65,7 +65,7 @@ Style/HashSyntax:
     - Rakefile
     - lib/**/*
     - test/**/*
-    - util/**/*
+    - tool/**/*
 
 Style/LineEndConcatenation:
   Enabled: true