Skip to content

Commit feae4ad

Browse files
authored
Merge pull request #2952 from ruby/worktree-graceful-kindling-mochi
ci: skip Gemfile.lock BUNDLED WITH on ruby-head
2 parents 9d0da5c + 57a26a6 commit feae4ad

2 files changed

Lines changed: 12 additions & 0 deletions

File tree

.github/workflows/ruby.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ jobs:
6363
if: ${{ contains(matrix.ruby, 'head') }}
6464
run: |
6565
bundle config set force_ruby_platform true
66+
- name: Ignore Gemfile.lock's BUNDLED WITH on ruby-head
67+
if: ${{ contains(matrix.ruby, 'head') }}
68+
run: bundle config set --local version system
6669
- name: Skip installing type checkers
6770
if: ${{ ! contains(matrix.job, 'typecheck_test') }}
6871
run: |
@@ -106,6 +109,9 @@ jobs:
106109
if: ${{ contains(matrix.ruby, 'head') }}
107110
run: |
108111
bundle config set force_ruby_platform true
112+
- name: Ignore Gemfile.lock's BUNDLED WITH on ruby-head
113+
if: ${{ contains(matrix.ruby, 'head') }}
114+
run: bundle config set --local version system
109115
- name: bin/setup
110116
run: |
111117
bin/setup
@@ -140,6 +146,9 @@ jobs:
140146
if: ${{ contains(matrix.ruby, 'head') }}
141147
run: |
142148
bundle config set force_ruby_platform true
149+
- name: Ignore Gemfile.lock's BUNDLED WITH on ruby-head
150+
if: ${{ contains(matrix.ruby, 'head') }}
151+
run: bundle config set --local version system
143152
- name: bin/setup
144153
run: |
145154
bin/setup

.github/workflows/windows.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ jobs:
3535
bundled_gems = JSON.parse(res)["gems"].map{_1["gem"]}
3636
system "gem uninstall #{bundled_gems.join(" ")} --force", exception: true
3737
'
38+
- name: Ignore Gemfile.lock's BUNDLED WITH on dev Ruby
39+
if: ${{ matrix.ruby == 'ucrt' || matrix.ruby == 'mswin' }}
40+
run: bundle config set --local version system
3841
- name: bundle install
3942
run: |
4043
bundle config set without profilers libs

0 commit comments

Comments
 (0)