mirror of
https://github.com/ruby/setup-ruby.git
synced 2026-09-13 14:34:21 +02:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 なつき
|
efbf473cab | ||
|
Hiroshi SHIBATA
|
bd28d3616a | ||
|
dependabot[bot]
|
3c08d92a33 |
@@ -11,7 +11,7 @@ jobs:
|
|||||||
GH_TOKEN: ${{ github.token }}
|
GH_TOKEN: ${{ github.token }}
|
||||||
GH_REPO: ${{ github.repository }}
|
GH_REPO: ${{ github.repository }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
- uses: ./
|
- uses: ./
|
||||||
|
|||||||
+21
-24
@@ -75,9 +75,6 @@ jobs:
|
|||||||
- { os: windows-11-arm, ruby: '3.1' }
|
- { os: windows-11-arm, ruby: '3.1' }
|
||||||
- { os: windows-11-arm, ruby: '3.2' }
|
- { os: windows-11-arm, ruby: '3.2' }
|
||||||
- { os: windows-11-arm, ruby: '3.3' }
|
- { 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
|
# RubyInstaller has no 64-bit builds of 1.9 on Windows
|
||||||
- { os: windows-2022, ruby: '1.9' }
|
- { os: windows-2022, ruby: '1.9' }
|
||||||
- { os: windows-2025, ruby: '1.9' }
|
- { os: windows-2025, ruby: '1.9' }
|
||||||
@@ -99,7 +96,7 @@ jobs:
|
|||||||
name: ${{ matrix.os }} ${{ matrix.ruby }}
|
name: ${{ matrix.os }} ${{ matrix.ruby }}
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
|
|
||||||
- uses: ./
|
- uses: ./
|
||||||
with:
|
with:
|
||||||
@@ -206,7 +203,7 @@ jobs:
|
|||||||
name: "Test .ruby-version"
|
name: "Test .ruby-version"
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
- run: echo "ruby-3.4.0" > .ruby-version
|
- run: echo "ruby-3.4.0" > .ruby-version
|
||||||
- uses: ./
|
- uses: ./
|
||||||
- run: ruby -v | grep -F "ruby 3.4.0"
|
- run: ruby -v | grep -F "ruby 3.4.0"
|
||||||
@@ -215,7 +212,7 @@ jobs:
|
|||||||
name: "Test .tool-versions"
|
name: "Test .tool-versions"
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
- run: echo -e "nodejs 16.0.0\nruby 3.4.0" > .tool-versions
|
- run: echo -e "nodejs 16.0.0\nruby 3.4.0" > .tool-versions
|
||||||
- uses: ./
|
- uses: ./
|
||||||
- run: ruby -v | grep -F "ruby 3.4.0"
|
- run: ruby -v | grep -F "ruby 3.4.0"
|
||||||
@@ -224,7 +221,7 @@ jobs:
|
|||||||
name: "Test mise.toml"
|
name: "Test mise.toml"
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
- run: echo -e "[tools]\nnode = '18'\nruby = '3.4.0'" > mise.toml
|
- run: echo -e "[tools]\nnode = '18'\nruby = '3.4.0'" > mise.toml
|
||||||
- uses: ./
|
- uses: ./
|
||||||
- run: ruby -v | grep -F "ruby 3.4.0"
|
- run: ruby -v | grep -F "ruby 3.4.0"
|
||||||
@@ -233,7 +230,7 @@ jobs:
|
|||||||
name: "Test with no Gemfile"
|
name: "Test with no Gemfile"
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
- run: rm Gemfile
|
- run: rm Gemfile
|
||||||
- uses: ./
|
- uses: ./
|
||||||
with:
|
with:
|
||||||
@@ -244,7 +241,7 @@ jobs:
|
|||||||
name: "Test with no Gemfile but with bundler-cache"
|
name: "Test with no Gemfile but with bundler-cache"
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
- run: rm Gemfile
|
- run: rm Gemfile
|
||||||
- uses: ./
|
- uses: ./
|
||||||
with:
|
with:
|
||||||
@@ -267,7 +264,7 @@ jobs:
|
|||||||
- { ruby: '2.3', expected_rubygems_version: '3.3.27' }
|
- { ruby: '2.3', expected_rubygems_version: '3.3.27' }
|
||||||
- { ruby: '2.0', expected_rubygems_version: '2.7.11' }
|
- { ruby: '2.0', expected_rubygems_version: '2.7.11' }
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
- uses: ./
|
- uses: ./
|
||||||
with:
|
with:
|
||||||
ruby-version: ${{ matrix.ruby }}
|
ruby-version: ${{ matrix.ruby }}
|
||||||
@@ -278,7 +275,7 @@ jobs:
|
|||||||
name: "Test rubygems: version upgrades RubyGems to that version if the default is older"
|
name: "Test rubygems: version upgrades RubyGems to that version if the default is older"
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
- uses: ./
|
- uses: ./
|
||||||
with:
|
with:
|
||||||
ruby-version: '2.6'
|
ruby-version: '2.6'
|
||||||
@@ -289,7 +286,7 @@ jobs:
|
|||||||
name: "Test rubygems: version noops if the default is newer"
|
name: "Test rubygems: version noops if the default is newer"
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
- uses: ./
|
- uses: ./
|
||||||
with:
|
with:
|
||||||
ruby-version: '3.1.0'
|
ruby-version: '3.1.0'
|
||||||
@@ -300,7 +297,7 @@ jobs:
|
|||||||
name: "Test rubygems: version uses the Bundler installed by the rubygems update"
|
name: "Test rubygems: version uses the Bundler installed by the rubygems update"
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
- uses: ./
|
- uses: ./
|
||||||
with:
|
with:
|
||||||
ruby-version: '3.1.0'
|
ruby-version: '3.1.0'
|
||||||
@@ -312,7 +309,7 @@ jobs:
|
|||||||
name: "Test bundler: 1.x for old Ruby"
|
name: "Test bundler: 1.x for old Ruby"
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
- uses: ./
|
- uses: ./
|
||||||
with:
|
with:
|
||||||
ruby-version: '2.3'
|
ruby-version: '2.3'
|
||||||
@@ -323,7 +320,7 @@ jobs:
|
|||||||
name: "Test with a major Bundler version"
|
name: "Test with a major Bundler version"
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
- uses: ./
|
- uses: ./
|
||||||
with:
|
with:
|
||||||
ruby-version: '2.6'
|
ruby-version: '2.6'
|
||||||
@@ -334,7 +331,7 @@ jobs:
|
|||||||
name: "Test with a minor Bundler version"
|
name: "Test with a minor Bundler version"
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
- uses: ./
|
- uses: ./
|
||||||
with:
|
with:
|
||||||
ruby-version: '2.6'
|
ruby-version: '2.6'
|
||||||
@@ -345,7 +342,7 @@ jobs:
|
|||||||
name: "Test with an exact Bundler version"
|
name: "Test with an exact Bundler version"
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
- uses: ./
|
- uses: ./
|
||||||
with:
|
with:
|
||||||
ruby-version: '2.6'
|
ruby-version: '2.6'
|
||||||
@@ -356,7 +353,7 @@ jobs:
|
|||||||
name: "Test with a Bundler pre/rc version"
|
name: "Test with a Bundler pre/rc version"
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
- uses: ./
|
- uses: ./
|
||||||
with:
|
with:
|
||||||
ruby-version: '2.6'
|
ruby-version: '2.6'
|
||||||
@@ -369,7 +366,7 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/bundler-dev.gemfile
|
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/bundler-dev.gemfile
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
- uses: ./
|
- uses: ./
|
||||||
with:
|
with:
|
||||||
ruby-version: ruby-head
|
ruby-version: ruby-head
|
||||||
@@ -381,7 +378,7 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/bundler1.gemfile
|
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/bundler1.gemfile
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
- uses: ./
|
- uses: ./
|
||||||
with:
|
with:
|
||||||
ruby-version: '2.7'
|
ruby-version: '2.7'
|
||||||
@@ -399,7 +396,7 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
|
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
- uses: ./
|
- uses: ./
|
||||||
with:
|
with:
|
||||||
ruby-version: '3.2'
|
ruby-version: '3.2'
|
||||||
@@ -412,7 +409,7 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/nokogiri.gemfile
|
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/nokogiri.gemfile
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
- uses: ./
|
- uses: ./
|
||||||
with:
|
with:
|
||||||
ruby-version: truffleruby-head
|
ruby-version: truffleruby-head
|
||||||
@@ -423,7 +420,7 @@ jobs:
|
|||||||
name: "Test windows-toolchain: none"
|
name: "Test windows-toolchain: none"
|
||||||
runs-on: windows-latest
|
runs-on: windows-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
- uses: ./
|
- uses: ./
|
||||||
with:
|
with:
|
||||||
ruby-version: '2.7'
|
ruby-version: '2.7'
|
||||||
@@ -435,7 +432,7 @@ jobs:
|
|||||||
lint:
|
lint:
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
- run: yarn install
|
- run: yarn install
|
||||||
- run: yarn run package
|
- run: yarn run package
|
||||||
- name: Check generated files are up to date
|
- name: Check generated files are up to date
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ jobs:
|
|||||||
update_branch:
|
update_branch:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
- run: git push origin HEAD:v1
|
- run: git push origin HEAD:v1
|
||||||
|
|||||||
@@ -395,10 +395,15 @@ export async function setupJavaHome(rubyPrefix) {
|
|||||||
console.log("JRuby failed to start, try Java 21 envs")
|
console.log("JRuby failed to start, try Java 21 envs")
|
||||||
|
|
||||||
let arch = os.arch()
|
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"
|
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 newHomeVar = `JAVA_HOME_21_${arch}`
|
||||||
let newHome = process.env[newHomeVar]
|
let newHome = process.env[newHomeVar]
|
||||||
|
|
||||||
|
|||||||
+6
-1
@@ -713,10 +713,15 @@ async function setupJavaHome(rubyPrefix) {
|
|||||||
console.log("JRuby failed to start, try Java 21 envs")
|
console.log("JRuby failed to start, try Java 21 envs")
|
||||||
|
|
||||||
let arch = os.arch()
|
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"
|
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 newHomeVar = `JAVA_HOME_21_${arch}`
|
||||||
let newHome = process.env[newHomeVar]
|
let newHome = process.env[newHomeVar]
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user