Revert "squash: use a separate cache key"

This reverts commit 78cb4d2.

Author: arielvalentin

.github/actions/test_gem/action.yml

@@ -57,7 +57,7 @@ runs:
         # of the benefits of bundler caching.
         rm -f "${dir}/Gemfile.lock"
 
-        echo "cache_key=cruby" >> $GITHUB_OUTPUT
+        echo "cache_key=mri" >> $GITHUB_OUTPUT
         if [[ "${{ inputs.ruby }}" == "jruby" ]]; then
           echo "cache_key=jruby" >> $GITHUB_OUTPUT
         elif [[ "${{ inputs.ruby }}" == "truffleruby" ]]; then
@@ -80,49 +80,57 @@ runs:
       shell: bash
       run: sudo apt update && sudo apt install -y imagemagick
 
+    # Install ruby and bundle dependencies and cache!
+    # ...but not for appraisals, sadly.
+    - name: Install Ruby ${{ inputs.ruby }} with dependencies
+      if: "${{ steps.setup.outputs.appraisals == 'false' }}"
+      uses: ruby/[email protected]
+      with:
+        ruby-version: "${{ inputs.ruby }}"
+        working-directory: "${{ steps.setup.outputs.gem_dir }}"
+        bundler:  "latest"
+        bundler-cache: true
+        cache-version: "${{ inputs.ruby }}-${{ steps.setup.outputs.cache_key }}"
+
     # If we're using appraisals, do it all manually.
     - name: Install Ruby ${{ inputs.ruby }} without dependencies
+      if: "${{ steps.setup.outputs.appraisals == 'true' }}"
       uses: ruby/[email protected]
       with:
-        bundler: "latest"
         ruby-version: "${{ inputs.ruby }}"
+        bundler:  "latest"
         working-directory: "${{ steps.setup.outputs.gem_dir }}"
-
-    - name: Install dependencies
+    # Perms workaround. See https://github.com/actions/runner-images/issues/10215
+    - name: Fix GEM_HOME permissions on GitHub Actions Runner
+      if: "${{ steps.setup.outputs.appraisals == 'true' }}"
       shell: bash
       run: |
-        echo "::group:: 💎 Install dependencies and generate appraisals 💎"
-        bundle install
-
-        echo "::endgroup::"
-      working-directory: "${{ steps.setup.outputs.gem_dir }}"
-
+        # 🛠️😭 Fix GEM_HOME permissions 😭🛠️
+        chmod -R o-w $(gem env home)
     - name: Install dependencies and generate appraisals
       if: "${{ steps.setup.outputs.appraisals == 'true' }}"
       shell: bash
       run: |
-        echo "::group:: 💎 Install dependencies and generate appraisals 💎"
-
+        # 💎 Install dependencies and generate appraisals 💎
+        bundle install --quiet --jobs=3 --retry=4
         bundle exec appraisal clean
         bundle exec appraisal generate
-
-        echo "::endgroup::"
       working-directory: "${{ steps.setup.outputs.gem_dir }}"
 
     - name: Test Gem
       shell: bash
       run: |
+        # 🍿 Test Gem 🍿
         if [[ -f "Appraisals" ]]; then
           for i in `bundle exec appraisal list | sed 's/-/_/g' `; do
             echo "::group::🔎 Appraising ${i}"
-            bundle install --gemfile=gemfiles/${i}.gemfile --jobs=3 --retry=4
-            bundle exec --gemfile=gemfiles/${i}.gemfile rake test
+            BUNDLE_GEMFILE=gemfiles/${i}.gemfile bundle install --quiet --jobs=3 --retry=4 && \
+            BUNDLE_GEMFILE=gemfiles/${i}.gemfile bundle show && \
+            BUNDLE_GEMFILE=gemfiles/${i}.gemfile bundle exec rake test || exit
             echo "::endgroup::"
           done
         else
-          echo "::group::🔎 Running Tests Standalone"
           bundle exec rake test
-          echo "::endgroup::"
         fi
       working-directory: "${{ steps.setup.outputs.gem_dir }}"
       env:

.instrumentation_generator/templates/gemspec.tt

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> <%= instrumentation_base_version %>'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.0'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'

CONTRIBUTING.md

@@ -392,7 +392,7 @@ index 42c5ecba..74fcc743 100644
 --- a/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec
 +++ b/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec
 @@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
-
+   spec.add_development_dependency 'bundler', '~> 2.4'
    spec.add_development_dependency 'minitest', '~> 5.0'
    spec.add_development_dependency 'rake', '~> 13.0'
 -  spec.add_development_dependency 'rubocop', '~> 1.50.0'
@@ -407,7 +407,7 @@ index e29acbfc..85622d25 100644
 --- a/propagator/xray/opentelemetry-propagator-xray.gemspec
 +++ b/propagator/xray/opentelemetry-propagator-xray.gemspec
 @@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
-
+   spec.add_development_dependency 'bundler', '~> 2.4'
    spec.add_development_dependency 'minitest', '~> 5.0'
    spec.add_development_dependency 'rake', '~> 13.0'
 -  spec.add_development_dependency 'rubocop', '~> 1.50.0'

helpers/mysql/opentelemetry-helpers-mysql.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-api', '~> 1.0'
   spec.add_dependency 'opentelemetry-common', '~> 0.21'
 
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'rake', '~> 13.0'

helpers/sql-obfuscation/opentelemetry-helpers-sql-obfuscation.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'opentelemetry-common', '~> 0.21'
 
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'rake', '~> 13.0'

helpers/sql/opentelemetry-helpers-sql.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-api', '~> 1.4.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'rake', '~> 13.0'

instrumentation/action_mailer/opentelemetry-instrumentation-action_mailer.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'

instrumentation/action_pack/opentelemetry-instrumentation-action_pack.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-rack', '~> 0.21'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'

instrumentation/action_view/opentelemetry-instrumentation-action_view.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'

instrumentation/active_job/opentelemetry-instrumentation-active_job.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-
+  spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'