Merge pull request #226 from Shopify/andyw8/rm-gemfile-lock-for-head

Remove Gemfile.lock for Ruby head
Shopify · Jan 10, 2024 · 86c8ba6 · 86c8ba6
2 parents 27009dd + 7a31bdd
commit 86c8ba6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,12 +11,12 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
         gemfile:
           - Gemfile
-          - gemfiles/Gemfile-rails-main
+          - Gemfile-rails-main
         ruby: ["3.0", "3.1", "3.2", "3.3", "head"]
         include:
           - ruby: "head"
             experimental: true
-          - gemfile: "gemfiles/Gemfile-rails-main"
+          - gemfile: "Gemfile-rails-main"
             experimental: true
         exclude:
           - os: "windows-latest"
@@ -28,8 +28,8 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Remove Gemfile.lock
-        if: matrix.os == 'windows-latest' && matrix.ruby == '3.1'
-        run: rm Gemfile.lock
+        if: (matrix.ruby == 'head' ) || (matrix.os == 'windows-latest' && matrix.ruby == '3.1')
+        run: "rm ${{ matrix.gemfile }}.lock
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1

diff --git a/gemfiles/Gemfile-rails-main → Gemfile-rails-main b/gemfiles/Gemfile-rails-main → Gemfile-rails-main