From 6b3a90e1b4b3f7a8196aaae23bb5e0e91e5cd8c7 Mon Sep 17 00:00:00 2001
From: david942j <david942j@gmail.com>
Date: Sat, 27 Jun 2026 18:00:21 +0800
Subject: [PATCH] Update bundler to 4.0.15 (#304)

* Update bundler to 4.0.15

* Remove Gemfile.lock if testing against head
---
 .github/workflows/ruby.yml | 10 +++++++++-
 Gemfile.lock               |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index 2af263b..41ae43b 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -22,11 +22,19 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+    - name: Strip lockfile on Ruby Head to bypass mismatch bundler version
+      if: matrix.ruby-version == 'head'
+      run: |
+        echo "Removing Gemfile.lock"
+        rm -f Gemfile.lock
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+        bundler-cache: ${{ matrix.ruby-version != 'head' }} # runs 'bundle install' and caches installed gems automatically
+    - name: Install dependencies for Ruby head
+      if: matrix.ruby-version == 'head'
+      run: bundle install
     - name: Install apt packages
       run: sudo apt update && sudo apt install -yy grep binutils-multiarch
     - name: Run tests
diff --git a/Gemfile.lock b/Gemfile.lock
index 96d0548..dc381c7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -79,4 +79,4 @@ DEPENDENCIES
   yard (~> 0.9)
 
 BUNDLED WITH
-   2.6.9
+  4.0.15