Merge pull request #5544 from solidusio/elia/gh-actions-fix

Set the bundle group globally during GH actions execution
solidusio · Dec 11, 2023 · 6f38ae2 · 6f38ae2
2 parents bcdc87e + f280fb6
commit 6f38ae2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/prepare_post_release.yml b/.github/workflows/prepare_post_release.yml
@@ -11,14 +11,14 @@ on:
 jobs:
   prepare:
     runs-on: ubuntu-latest
+    env:
+      BUNDLE_ONLY: "release"
     if: |
       github.event.pull_request.merged == true &&
         contains(github.event.pull_request.labels.*.name, 'release:generate')
     steps:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
-        env:
-          BUNDLE_ONLY: "release"
         with:
           ruby-version: "3.2"
           bundler-cache: true

diff --git a/.github/workflows/prepare_release.yml b/.github/workflows/prepare_release.yml
@@ -11,11 +11,11 @@ on:
 jobs:
   prepare:
     runs-on: ubuntu-latest
+    env:
+      BUNDLE_ONLY: "release"
     steps:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
-        env:
-          BUNDLE_ONLY: "release"
         with:
           ruby-version: "3.2"
           bundler-cache: true

diff --git a/.github/workflows/update_release_draft.yml b/.github/workflows/update_release_draft.yml
@@ -10,9 +10,9 @@ on:
 
 jobs:
   update:
+    runs-on: ubuntu-latest
     env:
       BUNDLE_ONLY: "release"
-    runs-on: ubuntu-latest
     if: |
       (github.event.pull_request.merged == true) &&
         !contains(github.event.pull_request.labels.*.name, 'changelog:skip')

diff --git a/sample/db/samples/shipping_methods.rb b/sample/db/samples/shipping_methods.rb
@@ -50,8 +50,7 @@
   }
 ])
 
-# The just below rubocop:disable directive will be removed once https://github.com/rubocop/rubocop/issues/12441 is resolved.
-{ # rubocop:disable Style/HashEachMethods
+{
   "UPS Ground (USD)" => [5, "USD"],
   "UPS Ground (EU)" => [5, "USD"],
   "UPS One Day (USD)" => [15, "USD"],