From 45dc484f8a9c0677adb8eb8f22dcb5b1ebef8635 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Jul 2025 11:12:30 +0000 Subject: [PATCH 1/9] Bump form-data from 2.5.3 to 2.5.5 Bumps [form-data](https://github.com/form-data/form-data) from 2.5.3 to 2.5.5. - [Release notes](https://github.com/form-data/form-data/releases) - [Changelog](https://github.com/form-data/form-data/blob/v2.5.5/CHANGELOG.md) - [Commits](https://github.com/form-data/form-data/compare/v2.5.3...v2.5.5) --- updated-dependencies: - dependency-name: form-data dependency-version: 2.5.5 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 19e5e64af..0b7bfecb1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -376,13 +376,14 @@ fast-xml-parser@^5.0.7: strnum "^2.1.0" form-data@^2.5.0: - version "2.5.3" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.3.tgz#f9bcf87418ce748513c0c3494bb48ec270c97acc" - integrity sha512-XHIrMD0NpDrNM/Ckf7XJiBbLl57KEhT3+i3yY+eWm+cqYZJQTZrKo8Y8AWKnuV5GT4scfuUGt9LzNoIx3dU1nQ== + version "2.5.5" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.5.tgz#a5f6364ad7e4e67e95b4a07e2d8c6f711c74f624" + integrity sha512-jqdObeR2rxZZbPSGL+3VckHMYtu+f9//KXBsVny6JSX/pa38Fy+bGjuG8eW/H6USNQWhLi8Num++cU2yOCNz4A== dependencies: asynckit "^0.4.0" combined-stream "^1.0.8" es-set-tostringtag "^2.1.0" + hasown "^2.0.2" mime-types "^2.1.35" safe-buffer "^5.2.1" From 3ec1ec052980bdcf0b5ae89a97640818055e7650 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Jul 2025 20:30:18 +0000 Subject: [PATCH 2/9] Bump brace-expansion from 1.1.11 to 1.1.12 Bumps [brace-expansion](https://github.com/juliangruber/brace-expansion) from 1.1.11 to 1.1.12. - [Release notes](https://github.com/juliangruber/brace-expansion/releases) - [Commits](https://github.com/juliangruber/brace-expansion/compare/1.1.11...v1.1.12) --- updated-dependencies: - dependency-name: brace-expansion dependency-version: 1.1.12 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- dist/index.js | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/index.js b/dist/index.js index 4df23eced..393c7dd88 100644 --- a/dist/index.js +++ b/dist/index.js @@ -42919,7 +42919,7 @@ function expand(str, isTop) { var isOptions = m.body.indexOf(',') >= 0; if (!isSequence && !isOptions) { // {a},b} - if (m.post.match(/,.*\}/)) { + if (m.post.match(/,(?!,).*\}/)) { str = m.pre + '{' + m.body + escClose + m.post; return expand(str); } diff --git a/yarn.lock b/yarn.lock index 0b7bfecb1..9b8cfef48 100644 --- a/yarn.lock +++ b/yarn.lock @@ -283,9 +283,9 @@ balanced-match@^1.0.0: integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + version "1.1.12" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.12.tgz#ab9b454466e5a8cc3a187beaad580412a9c5b843" + integrity sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg== dependencies: balanced-match "^1.0.0" concat-map "0.0.1" From 78876b7c8894d08b42550d55e74f0992dca902d0 Mon Sep 17 00:00:00 2001 From: Eliot Partridge Date: Sun, 20 Oct 2024 20:14:40 -0400 Subject: [PATCH 3/9] Use case-insensitive key comparsion for cache keys --- bundler.js | 2 +- common.js | 12 ++++++++++++ dist/index.js | 15 ++++++++++++++- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/bundler.js b/bundler.js index 711871bae..533bfaca7 100644 --- a/bundler.js +++ b/bundler.js @@ -206,7 +206,7 @@ export async function bundleInstall(gemfile, lockFile, platform, engine, rubyVer await exec.exec('bundle', ['install', '--jobs', '4']) // @actions/cache only allows to save for non-existing keys - if (cachedKey !== key) { + if (!common.isExactKeyMatch(key, cachedKey)) { if (cachedKey) { // existing cache but Gemfile.lock differs, clean old gems await exec.exec('bundle', ['clean']) } diff --git a/common.js b/common.js index 02e57b237..0b122dcc7 100644 --- a/common.js +++ b/common.js @@ -412,3 +412,15 @@ export async function setupJavaHome(rubyPrefix) { } }) } + +// Determines if two keys are an exact match for the purposes of cache matching +// Specifically, this is a case-insensitive match that ignores accents +// From actions/cache@v3 src/utils/actionUtils.ts (MIT) +export function isExactKeyMatch(key, cacheKey) { + return !!( + cacheKey && + cacheKey.localeCompare(key, undefined, { + sensitivity: 'accent' + }) === 0 + ); +} diff --git a/dist/index.js b/dist/index.js index 393c7dd88..813a6df71 100644 --- a/dist/index.js +++ b/dist/index.js @@ -220,7 +220,7 @@ async function bundleInstall(gemfile, lockFile, platform, engine, rubyVersion, b await exec.exec('bundle', ['install', '--jobs', '4']) // @actions/cache only allows to save for non-existing keys - if (cachedKey !== key) { + if (!common.isExactKeyMatch(key, cachedKey)) { if (cachedKey) { // existing cache but Gemfile.lock differs, clean old gems await exec.exec('bundle', ['clean']) } @@ -299,6 +299,7 @@ __nccwpck_require__.r(__webpack_exports__); /* harmony export */ isBundler1Default: () => (/* binding */ isBundler1Default), /* harmony export */ isBundler2Default: () => (/* binding */ isBundler2Default), /* harmony export */ isBundler2dot2Default: () => (/* binding */ isBundler2dot2Default), +/* harmony export */ isExactKeyMatch: () => (/* binding */ isExactKeyMatch), /* harmony export */ isHeadVersion: () => (/* binding */ isHeadVersion), /* harmony export */ isSelfHostedRunner: () => (/* binding */ isSelfHostedRunner), /* harmony export */ isStableVersion: () => (/* binding */ isStableVersion), @@ -730,6 +731,18 @@ async function setupJavaHome(rubyPrefix) { }) } +// Determines if two keys are an exact match for the purposes of cache matching +// Specifically, this is a case-insensitive match that ignores accents +// From actions/cache@v3 src/utils/actionUtils.ts (MIT) +function isExactKeyMatch(key, cacheKey) { + return !!( + cacheKey && + cacheKey.localeCompare(key, undefined, { + sensitivity: 'accent' + }) === 0 + ); +} + /***/ }), From 2a7b30092b0caf9c046252510f9273b4875f3db9 Mon Sep 17 00:00:00 2001 From: Eliot Partridge Date: Mon, 21 Oct 2024 11:52:42 -0400 Subject: [PATCH 4/9] Rename to `isExactCacheKeyMatch` --- bundler.js | 2 +- common.js | 2 +- dist/index.js | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bundler.js b/bundler.js index 533bfaca7..816c56bf8 100644 --- a/bundler.js +++ b/bundler.js @@ -206,7 +206,7 @@ export async function bundleInstall(gemfile, lockFile, platform, engine, rubyVer await exec.exec('bundle', ['install', '--jobs', '4']) // @actions/cache only allows to save for non-existing keys - if (!common.isExactKeyMatch(key, cachedKey)) { + if (!common.isExactCacheKeyMatch(key, cachedKey)) { if (cachedKey) { // existing cache but Gemfile.lock differs, clean old gems await exec.exec('bundle', ['clean']) } diff --git a/common.js b/common.js index 0b122dcc7..72e2a9ceb 100644 --- a/common.js +++ b/common.js @@ -416,7 +416,7 @@ export async function setupJavaHome(rubyPrefix) { // Determines if two keys are an exact match for the purposes of cache matching // Specifically, this is a case-insensitive match that ignores accents // From actions/cache@v3 src/utils/actionUtils.ts (MIT) -export function isExactKeyMatch(key, cacheKey) { +export function isExactCacheKeyMatch(key, cacheKey) { return !!( cacheKey && cacheKey.localeCompare(key, undefined, { diff --git a/dist/index.js b/dist/index.js index 813a6df71..b01209501 100644 --- a/dist/index.js +++ b/dist/index.js @@ -220,7 +220,7 @@ async function bundleInstall(gemfile, lockFile, platform, engine, rubyVersion, b await exec.exec('bundle', ['install', '--jobs', '4']) // @actions/cache only allows to save for non-existing keys - if (!common.isExactKeyMatch(key, cachedKey)) { + if (!common.isExactCacheKeyMatch(key, cachedKey)) { if (cachedKey) { // existing cache but Gemfile.lock differs, clean old gems await exec.exec('bundle', ['clean']) } @@ -299,7 +299,7 @@ __nccwpck_require__.r(__webpack_exports__); /* harmony export */ isBundler1Default: () => (/* binding */ isBundler1Default), /* harmony export */ isBundler2Default: () => (/* binding */ isBundler2Default), /* harmony export */ isBundler2dot2Default: () => (/* binding */ isBundler2dot2Default), -/* harmony export */ isExactKeyMatch: () => (/* binding */ isExactKeyMatch), +/* harmony export */ isExactCacheKeyMatch: () => (/* binding */ isExactCacheKeyMatch), /* harmony export */ isHeadVersion: () => (/* binding */ isHeadVersion), /* harmony export */ isSelfHostedRunner: () => (/* binding */ isSelfHostedRunner), /* harmony export */ isStableVersion: () => (/* binding */ isStableVersion), @@ -734,7 +734,7 @@ async function setupJavaHome(rubyPrefix) { // Determines if two keys are an exact match for the purposes of cache matching // Specifically, this is a case-insensitive match that ignores accents // From actions/cache@v3 src/utils/actionUtils.ts (MIT) -function isExactKeyMatch(key, cacheKey) { +function isExactCacheKeyMatch(key, cacheKey) { return !!( cacheKey && cacheKey.localeCompare(key, undefined, { From 595828d48d03a26a98a9181e6a7b3a957ea368b4 Mon Sep 17 00:00:00 2001 From: Yuki Fukuma Date: Wed, 6 Aug 2025 08:56:45 +0900 Subject: [PATCH 5/9] Update ruby version in `README.md` Use current ruby version in examples. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c8fd9ffba..301c40042 100644 --- a/README.md +++ b/README.md @@ -79,7 +79,7 @@ jobs: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: '3.3' # Not needed with a .ruby-version, .tool-versions or mise.toml + ruby-version: '3.4' # Not needed with a .ruby-version, .tool-versions or mise.toml bundler-cache: true # runs 'bundle install' and caches installed gems automatically - run: bundle exec rake ``` @@ -98,7 +98,7 @@ jobs: matrix: os: [ubuntu-latest, macos-latest] # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0' - ruby: ['2.7', '3.0', '3.1', '3.2', '3.3', head, jruby, jruby-head, truffleruby, truffleruby-head] + ruby: ['2.7', '3.0', '3.1', '3.2', '3.3', '3.4', head, jruby, jruby-head, truffleruby, truffleruby-head] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -127,7 +127,7 @@ jobs: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: '3.3' + ruby-version: '3.4' bundler-cache: true # runs 'bundle install' and caches installed gems automatically - run: bundle exec rake ``` From 76da3376798599115ed11bf448e7a8390e34378c Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Wed, 6 Aug 2025 13:10:04 +0200 Subject: [PATCH 6/9] Update GitHub-hosted runners link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 301c40042..1eeb590ad 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ which means Ruby ≤ 2.4 is unmaintained and considered insecure. ### Supported Platforms -The action works on these [GitHub-hosted runners](https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources) images. Runner images not listed below are not supported yet. `$OS-latest` just alias to one of these images. +The action works on these [GitHub-hosted runners](https://docs.github.com/en/actions/reference/runners/github-hosted-runners) images. Runner images not listed below are not supported yet. `$OS-latest` just alias to one of these images. | Operating System | Supported | | ---------------- | --------- | From 829114fc20da43a41d27359103ec7a63020954d4 Mon Sep 17 00:00:00 2001 From: ruby-builder-bot <98265520+ruby-builder-bot@users.noreply.github.com> Date: Mon, 11 Aug 2025 19:04:29 +0000 Subject: [PATCH 7/9] Add jruby-10.0.2.0 --- README.md | 2 +- dist/index.js | 2 +- ruby-builder-versions.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1eeb590ad..c27d8a303 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ This action currently supports these versions of MRI, JRuby and TruffleRuby: | Interpreter | Versions | | ----------- | -------- | | `ruby` | 1.9.3, 2.0.0, 2.1.9, 2.2, all versions from 2.3.0 until 3.5.0-preview1, head, debug, mingw, mswin, ucrt | -| `jruby` | 9.1.17.0 - 10.0.1.0, head | +| `jruby` | 9.1.17.0 - 10.0.2.0, head | | `truffleruby` | 19.3.0 - 24.2.1, head | | `truffleruby+graalvm` | 21.2.0 - 24.2.1, head | diff --git a/dist/index.js b/dist/index.js index b01209501..54dac9fe9 100644 --- a/dist/index.js +++ b/dist/index.js @@ -85167,7 +85167,7 @@ module.exports = /*#__PURE__*/JSON.parse('{"name":"@actions/cache","version":"4. /***/ ((module) => { "use strict"; -module.exports = /*#__PURE__*/JSON.parse('{"ruby":["1.9.3-p551","2.0.0-p648","2.1.9","2.2.10","2.3.0","2.3.1","2.3.2","2.3.3","2.3.4","2.3.5","2.3.6","2.3.7","2.3.8","2.4.0","2.4.1","2.4.2","2.4.3","2.4.4","2.4.5","2.4.6","2.4.7","2.4.9","2.4.10","2.5.0","2.5.1","2.5.2","2.5.3","2.5.4","2.5.5","2.5.6","2.5.7","2.5.8","2.5.9","2.6.0","2.6.1","2.6.2","2.6.3","2.6.4","2.6.5","2.6.6","2.6.7","2.6.8","2.6.9","2.6.10","2.7.0","2.7.1","2.7.2","2.7.3","2.7.4","2.7.5","2.7.6","2.7.7","2.7.8","3.0.0-preview1","3.0.0-preview2","3.0.0-rc1","3.0.0","3.0.1","3.0.2","3.0.3","3.0.4","3.0.5","3.0.6","3.0.7","3.1.0-preview1","3.1.0","3.1.1","3.1.2","3.1.3","3.1.4","3.1.5","3.1.6","3.1.7","3.2.0-preview1","3.2.0-preview2","3.2.0-preview3","3.2.0-rc1","3.2.0","3.2.1","3.2.2","3.2.3","3.2.4","3.2.5","3.2.6","3.2.7","3.2.8","3.2.9","3.3.0-preview1","3.3.0-preview2","3.3.0-preview3","3.3.0-rc1","3.3.0","3.3.1","3.3.2","3.3.3","3.3.4","3.3.5","3.3.6","3.3.7","3.3.8","3.3.9","3.4.0-preview1","3.4.0-preview2","3.4.0-rc1","3.4.0","3.4.1","3.4.2","3.4.3","3.4.4","3.4.5","3.5.0-preview1","head","debug","asan","3.4-asan"],"jruby":["9.1.17.0","9.2.9.0","9.2.10.0","9.2.11.0","9.2.11.1","9.2.12.0","9.2.13.0","9.2.14.0","9.2.15.0","9.2.16.0","9.2.17.0","9.2.18.0","9.2.19.0","9.2.20.0","9.2.20.1","9.2.21.0","9.3.0.0","9.3.1.0","9.3.2.0","9.3.3.0","9.3.4.0","9.3.6.0","9.3.7.0","9.3.8.0","9.3.9.0","9.3.10.0","9.3.11.0","9.3.13.0","9.3.14.0","9.3.15.0","9.4.0.0","9.4.1.0","9.4.2.0","9.4.3.0","9.4.4.0","9.4.5.0","9.4.6.0","9.4.7.0","9.4.8.0","9.4.9.0","9.4.10.0","9.4.11.0","9.4.12.0","9.4.12.1","9.4.13.0","10.0.0.0","10.0.0.1","10.0.1.0","head"],"truffleruby":["19.3.0","19.3.1","20.0.0","20.1.0","20.2.0","20.3.0","21.0.0","21.1.0","21.2.0","21.2.0.1","21.3.0","22.0.0.2","22.1.0","22.2.0","22.3.0","22.3.1","23.0.0-preview1","23.0.0","23.1.0","23.1.1","23.1.2","24.0.0","24.0.1","24.0.2","24.1.0","24.1.1","24.1.2","24.2.0","24.2.1","head"],"truffleruby+graalvm":["21.2.0","21.3.0","22.0.0.2","22.1.0","22.2.0","22.3.0","22.3.1","23.0.0-preview1","23.0.0","23.1.0","23.1.1","23.1.2","24.0.0","24.0.1","24.0.2","24.1.0","24.1.1","24.1.2","24.2.0","24.2.1","head"]}'); +module.exports = /*#__PURE__*/JSON.parse('{"ruby":["1.9.3-p551","2.0.0-p648","2.1.9","2.2.10","2.3.0","2.3.1","2.3.2","2.3.3","2.3.4","2.3.5","2.3.6","2.3.7","2.3.8","2.4.0","2.4.1","2.4.2","2.4.3","2.4.4","2.4.5","2.4.6","2.4.7","2.4.9","2.4.10","2.5.0","2.5.1","2.5.2","2.5.3","2.5.4","2.5.5","2.5.6","2.5.7","2.5.8","2.5.9","2.6.0","2.6.1","2.6.2","2.6.3","2.6.4","2.6.5","2.6.6","2.6.7","2.6.8","2.6.9","2.6.10","2.7.0","2.7.1","2.7.2","2.7.3","2.7.4","2.7.5","2.7.6","2.7.7","2.7.8","3.0.0-preview1","3.0.0-preview2","3.0.0-rc1","3.0.0","3.0.1","3.0.2","3.0.3","3.0.4","3.0.5","3.0.6","3.0.7","3.1.0-preview1","3.1.0","3.1.1","3.1.2","3.1.3","3.1.4","3.1.5","3.1.6","3.1.7","3.2.0-preview1","3.2.0-preview2","3.2.0-preview3","3.2.0-rc1","3.2.0","3.2.1","3.2.2","3.2.3","3.2.4","3.2.5","3.2.6","3.2.7","3.2.8","3.2.9","3.3.0-preview1","3.3.0-preview2","3.3.0-preview3","3.3.0-rc1","3.3.0","3.3.1","3.3.2","3.3.3","3.3.4","3.3.5","3.3.6","3.3.7","3.3.8","3.3.9","3.4.0-preview1","3.4.0-preview2","3.4.0-rc1","3.4.0","3.4.1","3.4.2","3.4.3","3.4.4","3.4.5","3.5.0-preview1","head","debug","asan","3.4-asan"],"jruby":["9.1.17.0","9.2.9.0","9.2.10.0","9.2.11.0","9.2.11.1","9.2.12.0","9.2.13.0","9.2.14.0","9.2.15.0","9.2.16.0","9.2.17.0","9.2.18.0","9.2.19.0","9.2.20.0","9.2.20.1","9.2.21.0","9.3.0.0","9.3.1.0","9.3.2.0","9.3.3.0","9.3.4.0","9.3.6.0","9.3.7.0","9.3.8.0","9.3.9.0","9.3.10.0","9.3.11.0","9.3.13.0","9.3.14.0","9.3.15.0","9.4.0.0","9.4.1.0","9.4.2.0","9.4.3.0","9.4.4.0","9.4.5.0","9.4.6.0","9.4.7.0","9.4.8.0","9.4.9.0","9.4.10.0","9.4.11.0","9.4.12.0","9.4.12.1","9.4.13.0","10.0.0.0","10.0.0.1","10.0.1.0","10.0.2.0","head"],"truffleruby":["19.3.0","19.3.1","20.0.0","20.1.0","20.2.0","20.3.0","21.0.0","21.1.0","21.2.0","21.2.0.1","21.3.0","22.0.0.2","22.1.0","22.2.0","22.3.0","22.3.1","23.0.0-preview1","23.0.0","23.1.0","23.1.1","23.1.2","24.0.0","24.0.1","24.0.2","24.1.0","24.1.1","24.1.2","24.2.0","24.2.1","head"],"truffleruby+graalvm":["21.2.0","21.3.0","22.0.0.2","22.1.0","22.2.0","22.3.0","22.3.1","23.0.0-preview1","23.0.0","23.1.0","23.1.1","23.1.2","24.0.0","24.0.1","24.0.2","24.1.0","24.1.1","24.1.2","24.2.0","24.2.1","head"]}'); /***/ }), diff --git a/ruby-builder-versions.json b/ruby-builder-versions.json index 227b91a9f..398939a67 100644 --- a/ruby-builder-versions.json +++ b/ruby-builder-versions.json @@ -22,7 +22,7 @@ "9.2.9.0", "9.2.10.0", "9.2.11.0", "9.2.11.1", "9.2.12.0", "9.2.13.0", "9.2.14.0", "9.2.15.0", "9.2.16.0", "9.2.17.0", "9.2.18.0", "9.2.19.0", "9.2.20.0", "9.2.20.1", "9.2.21.0", "9.3.0.0", "9.3.1.0", "9.3.2.0", "9.3.3.0", "9.3.4.0", "9.3.6.0", "9.3.7.0", "9.3.8.0", "9.3.9.0", "9.3.10.0", "9.3.11.0", "9.3.13.0", "9.3.14.0", "9.3.15.0", "9.4.0.0", "9.4.1.0", "9.4.2.0", "9.4.3.0", "9.4.4.0", "9.4.5.0", "9.4.6.0", "9.4.7.0", "9.4.8.0", "9.4.9.0", "9.4.10.0", "9.4.11.0", "9.4.12.0", "9.4.12.1", "9.4.13.0", - "10.0.0.0", "10.0.0.1", "10.0.1.0", + "10.0.0.0", "10.0.0.1", "10.0.1.0", "10.0.2.0", "head" ], "truffleruby": [ From 3c08d92a330c0e20f7dd468f21bf9c32d52a5f1c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Aug 2025 03:15:35 +0000 Subject: [PATCH 8/9] Bump actions/checkout from 4 to 5 Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 42 +++++++++++++------------- .github/workflows/update-v1-branch.yml | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a74a6a3df..fe1a6ee68 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ jobs: GH_TOKEN: ${{ github.token }} GH_REPO: ${{ github.repository }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: fetch-depth: 0 - uses: ./ diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d9371a319..06c7d7d44 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -99,7 +99,7 @@ jobs: name: ${{ matrix.os }} ${{ matrix.ruby }} runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: ./ with: @@ -206,7 +206,7 @@ jobs: name: "Test .ruby-version" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - run: echo "ruby-3.4.0" > .ruby-version - uses: ./ - run: ruby -v | grep -F "ruby 3.4.0" @@ -215,7 +215,7 @@ jobs: name: "Test .tool-versions" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - run: echo -e "nodejs 16.0.0\nruby 3.4.0" > .tool-versions - uses: ./ - run: ruby -v | grep -F "ruby 3.4.0" @@ -224,7 +224,7 @@ jobs: name: "Test mise.toml" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - run: echo -e "[tools]\nnode = '18'\nruby = '3.4.0'" > mise.toml - uses: ./ - run: ruby -v | grep -F "ruby 3.4.0" @@ -233,7 +233,7 @@ jobs: name: "Test with no Gemfile" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - run: rm Gemfile - uses: ./ with: @@ -244,7 +244,7 @@ jobs: name: "Test with no Gemfile but with bundler-cache" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - run: rm Gemfile - uses: ./ with: @@ -267,7 +267,7 @@ jobs: - { ruby: '2.3', expected_rubygems_version: '3.3.27' } - { ruby: '2.0', expected_rubygems_version: '2.7.11' } steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: ./ with: ruby-version: ${{ matrix.ruby }} @@ -278,7 +278,7 @@ jobs: name: "Test rubygems: version upgrades RubyGems to that version if the default is older" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: ./ with: ruby-version: '2.6' @@ -289,7 +289,7 @@ jobs: name: "Test rubygems: version noops if the default is newer" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: ./ with: ruby-version: '3.1.0' @@ -300,7 +300,7 @@ jobs: name: "Test rubygems: version uses the Bundler installed by the rubygems update" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: ./ with: ruby-version: '3.1.0' @@ -312,7 +312,7 @@ jobs: name: "Test bundler: 1.x for old Ruby" runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: ./ with: ruby-version: '2.3' @@ -323,7 +323,7 @@ jobs: name: "Test with a major Bundler version" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: ./ with: ruby-version: '2.6' @@ -334,7 +334,7 @@ jobs: name: "Test with a minor Bundler version" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: ./ with: ruby-version: '2.6' @@ -345,7 +345,7 @@ jobs: name: "Test with an exact Bundler version" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: ./ with: ruby-version: '2.6' @@ -356,7 +356,7 @@ jobs: name: "Test with a Bundler pre/rc version" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: ./ with: ruby-version: '2.6' @@ -369,7 +369,7 @@ jobs: env: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/bundler-dev.gemfile steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: ./ with: ruby-version: ruby-head @@ -381,7 +381,7 @@ jobs: env: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/bundler1.gemfile steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: ./ with: ruby-version: '2.7' @@ -399,7 +399,7 @@ jobs: env: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: ./ with: ruby-version: '3.2' @@ -412,7 +412,7 @@ jobs: env: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/nokogiri.gemfile steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: ./ with: ruby-version: truffleruby-head @@ -423,7 +423,7 @@ jobs: name: "Test windows-toolchain: none" runs-on: windows-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: ./ with: ruby-version: '2.7' @@ -435,7 +435,7 @@ jobs: lint: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - run: yarn install - run: yarn run package - name: Check generated files are up to date diff --git a/.github/workflows/update-v1-branch.yml b/.github/workflows/update-v1-branch.yml index 6382676df..9ff06ada4 100644 --- a/.github/workflows/update-v1-branch.yml +++ b/.github/workflows/update-v1-branch.yml @@ -9,7 +9,7 @@ jobs: update_branch: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: fetch-depth: 0 - run: git push origin HEAD:v1 From efbf473cab83af4468e8606cc33eca9281bb213f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AA=E3=81=A4=E3=81=8D?= Date: Mon, 11 Aug 2025 18:10:53 -0700 Subject: [PATCH 9/9] Add JRuby for Windows on Arm --- .github/workflows/test.yml | 3 --- common.js | 7 ++++++- dist/index.js | 7 ++++++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 06c7d7d44..574bb52d6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -75,9 +75,6 @@ jobs: - { os: windows-11-arm, ruby: '3.1' } - { os: windows-11-arm, ruby: '3.2' } - { os: windows-11-arm, ruby: '3.3' } - # https://github.com/ruby/jruby-dev-builder/pull/14#issuecomment-2829841247 - - { os: windows-11-arm, ruby: jruby } - - { os: windows-11-arm, ruby: jruby-head } # RubyInstaller has no 64-bit builds of 1.9 on Windows - { os: windows-2022, ruby: '1.9' } - { os: windows-2025, ruby: '1.9' } diff --git a/common.js b/common.js index 72e2a9ceb..247d99eed 100644 --- a/common.js +++ b/common.js @@ -395,10 +395,15 @@ export async function setupJavaHome(rubyPrefix) { console.log("JRuby failed to start, try Java 21 envs") let arch = os.arch() - if (arch === "x64" || os.platform() !== "darwin") { + if (arch === "arm64" && os.platform() === "win32") { + arch = "AARCH64" + } else if (arch === "x64" || os.platform() !== "darwin") { arch = "X64" } + // JAVA_HOME_21_AARCH64 - https://github.com/actions/partner-runner-images/blob/main/images/arm-windows-11-image.md#java + // JAVA_HOME_21_arm64 - https://github.com/actions/runner-images/blob/main/images/macos/macos-15-arm64-Readme.md#java + // JAVA_HOME_21_X64 - https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md#java let newHomeVar = `JAVA_HOME_21_${arch}` let newHome = process.env[newHomeVar] diff --git a/dist/index.js b/dist/index.js index 54dac9fe9..a86b6b235 100644 --- a/dist/index.js +++ b/dist/index.js @@ -713,10 +713,15 @@ async function setupJavaHome(rubyPrefix) { console.log("JRuby failed to start, try Java 21 envs") let arch = os.arch() - if (arch === "x64" || os.platform() !== "darwin") { + if (arch === "arm64" && os.platform() === "win32") { + arch = "AARCH64" + } else if (arch === "x64" || os.platform() !== "darwin") { arch = "X64" } + // JAVA_HOME_21_AARCH64 - https://github.com/actions/partner-runner-images/blob/main/images/arm-windows-11-image.md#java + // JAVA_HOME_21_arm64 - https://github.com/actions/runner-images/blob/main/images/macos/macos-15-arm64-Readme.md#java + // JAVA_HOME_21_X64 - https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md#java let newHomeVar = `JAVA_HOME_21_${arch}` let newHome = process.env[newHomeVar]