From 9d31d7ad3bf4b75607625b6c3687ce59ba9fe191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Tue, 24 Sep 2024 12:19:34 +0200 Subject: [PATCH 1/3] Update Bundler to 2.5.20 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2410d0f..fe1766f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -70,4 +70,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.4.12 + 2.5.20 From aad35096ee2f6cef8acd81da6d73344cc3ffbca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Mon, 30 Sep 2024 13:02:02 +0200 Subject: [PATCH 2/3] Bump tested truffleruby to 24.0.1 --- .github/workflows/rubygems.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rubygems.yml b/.github/workflows/rubygems.yml index b5b03b5..daf19f3 100644 --- a/.github/workflows/rubygems.yml +++ b/.github/workflows/rubygems.yml @@ -38,7 +38,7 @@ jobs: - ruby: { name: jruby-9.4, value: jruby-9.4.2.0 } os: { name: Ubuntu, value: ubuntu-22.04 } - - ruby: { name: truffleruby-22, value: truffleruby-22.3.0 } + - ruby: { name: truffleruby-24, value: truffleruby-24.1.0 } os: { name: Ubuntu, value: ubuntu-22.04 } - os: { name: Windows, value: windows-2022 } @@ -53,7 +53,7 @@ jobs: steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Setup ruby (Ubuntu/macOS) - uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0 + uses: ruby/setup-ruby@f321cf5a4d1533575411f8752cf25b86478b0442 # v1.193.0 with: ruby-version: ${{ matrix.ruby.value }} bundler-cache: true From ee5fc2a534357c5b0aa2228875e64bb4c150d68b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Mon, 30 Sep 2024 13:02:19 +0200 Subject: [PATCH 3/3] Verify upstream fix to mswin CI --- .github/workflows/rubygems.yml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rubygems.yml b/.github/workflows/rubygems.yml index daf19f3..476db12 100644 --- a/.github/workflows/rubygems.yml +++ b/.github/workflows/rubygems.yml @@ -64,7 +64,28 @@ jobs: ruby-version: ${{ matrix.ruby.value }} bundler-cache: true mingw: clang - if: matrix.os.name == 'Windows' + if: matrix.os.name == 'Windows' && matrix.ruby.name != 'mswin' + - name: Setup ruby (Windows mswin) + uses: ruby/setup-ruby-pkgs@1493c009477b19efcb54cfaf72b5f9d1fd6ba86c # v1.33.2 + with: + ruby-version: ${{ matrix.ruby.value }} + mingw: clang + if: matrix.os.name == 'Windows' && matrix.ruby.name == 'mswin' + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + with: + repository: rubygems/rubygems + ref: deivid-rodriguez/no-ruby-prepend + path: rubygems + if: matrix.ruby.name == 'mswin' + - run: ruby setup.rb + working-directory: rubygems + if: matrix.ruby.name == 'mswin' + - run: rm -rf rubygems + shell: bash + if: matrix.ruby.name == 'mswin' + - name: Bundle install + run: 'D:\ruby-mswin\bin\bundle.bat install --jobs 4' + if: matrix.os.name == 'Windows' && matrix.ruby.name == 'mswin' - name: Configure bindgen shell: pwsh run: |