Skip to content

Commit d4819a1

Browse files
committed
try
1 parent ad8c5c6 commit d4819a1

File tree

2 files changed

+19
-4
lines changed

2 files changed

+19
-4
lines changed

.github/workflows/build.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: TruffleRuby Dev Builds
22
on:
33
workflow_dispatch:
44
push:
5+
branches:
6+
- 'ea-build-with-truffleruby-master'
57
tags:
68
- '*'
79
schedule:
@@ -36,7 +38,7 @@ jobs:
3638
console.log(`Latest release commit: ${latestReleaseCommit}`)
3739
console.log(`Latest truffleruby commit: ${latestDevCommit}`)
3840
if (latestReleaseCommit === latestDevCommit) {
39-
return 'false'
41+
return 'true' // TODO
4042
} else {
4143
return 'true'
4244
}
@@ -79,14 +81,19 @@ jobs:
7981
fail-fast: false
8082
matrix:
8183
os: [ ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-13, macos-14 ]
82-
name: [ '-head', '+graalvm-head' ]
84+
# name: [ '-head', '+graalvm-head', '+graalvm-ea' ]
85+
name: [ '+graalvm-ea' ]
8386
runs-on: ${{ matrix.os }}
8487
steps:
8588
- name: Clone truffleruby
8689
uses: actions/checkout@v4
8790
with:
8891
repository: oracle/truffleruby
8992
ref: ${{ needs.prepare.outputs.commit }}
93+
- uses: actions/checkout@v4
94+
with:
95+
path: truffleruby-dev-builder
96+
if: matrix.name == '+graalvm-ea'
9097

9198
- name: Set platform
9299
id: platform
@@ -118,6 +125,7 @@ jobs:
118125
run: |
119126
jt install jvmci
120127
echo "JAVA_HOME=$(jt install jvmci)" >> $GITHUB_ENV
128+
if: matrix.name != '+graalvm-ea' # the graal common.json will change
121129
- name: Install mx
122130
run: jt mx --version
123131

@@ -129,12 +137,17 @@ jobs:
129137
- name: Build TruffleRuby (jvm)
130138
run: jt build --env jvm-ce-libgraal
131139
if: matrix.name == '+graalvm-head'
140+
- name: Build TruffleRuby (jvm-ea)
141+
run: ruby truffleruby-dev-builder/ea-build-with-truffleruby-master.rb
142+
if: matrix.name == '+graalvm-ea'
132143

133144
- run: mkdir -p ~/.rubies
134145
- run: mv $(jt mx --env native standalone-home --type=native ruby) ~/.rubies/truffleruby${{ matrix.name }}
135146
if: matrix.name == '-head'
136147
- run: mv $(jt mx --env jvm-ce-libgraal standalone-home --type=jvm ruby) ~/.rubies/truffleruby${{ matrix.name }}
137148
if: matrix.name == '+graalvm-head'
149+
- run: mv truffleruby-jvm-ea-master-build ~/.rubies/truffleruby${{ matrix.name }}
150+
if: matrix.name == '+graalvm-ea'
138151
- name: Create archive
139152
run: tar czf truffleruby${{ matrix.name }}-${{ steps.platform.outputs.platform }}.tar.gz -C ~/.rubies truffleruby${{ matrix.name }}
140153

@@ -150,6 +163,7 @@ jobs:
150163
run: gh release upload "${{ needs.release.outputs.tag }}" "truffleruby${{ matrix.name }}-${{ steps.platform.outputs.platform }}.tar.gz"
151164

152165
publish:
166+
if: false
153167
name: Publish Release
154168
needs: [release, build]
155169
runs-on: ubuntu-latest

ea-build-with-truffleruby-master.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
include FileUtils::Verbose
55

66
def sh(*args, **kwargs)
7-
puts "$ #{args.join(" ")}"
7+
puts "::group::$ #{args.join(" ")}"
88
system(*args, exception: true, **kwargs)
9+
puts "::endgroup::"
910
end
1011

1112
os = case RbConfig::CONFIG['host_os']
@@ -26,7 +27,7 @@ def sh(*args, **kwargs)
2627
ea_build_archive = "truffleruby-jvm-ea-build.tar.gz"
2728

2829
unless File.exist? ea_build_archive
29-
sh "wget", "-O", ea_build_archive, url
30+
sh "wget", "--progress=dot:mega", "-O", ea_build_archive, url
3031
end
3132

3233
ea_build = `tar tf truffleruby-jvm-ea-build.tar.gz | head -1`[/^(.+?)\//, 1]

0 commit comments

Comments
 (0)