Skip to content

Commit dc23d64

Browse files
committed
[GR-18163] Fix GitHub Actions CI to handle mxbuild/truffleruby-* being symlinks
PullRequest: truffleruby/2502
2 parents 3f72d2f + cc06a5f commit dc23d64

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,14 @@ jobs:
6060
run: jt build
6161

6262
- name: Create archive
63-
run: tar cf truffleruby-jvm.tar truffleruby-jvm
64-
working-directory: build/mxbuild
63+
run: |
64+
cd $(dirname $(jt graalvm-home))
65+
mv $(basename $(jt graalvm-home)) truffleruby-jvm
66+
tar cf ${{ github.workspace }}/truffleruby-jvm.tar truffleruby-jvm
6567
- uses: actions/upload-artifact@v2
6668
with:
6769
name: truffleruby-jvm
68-
path: build/mxbuild/truffleruby-jvm.tar
70+
path: ${{ github.workspace }}/truffleruby-jvm.tar
6971

7072
build_native:
7173
name: build native
@@ -104,12 +106,14 @@ jobs:
104106
run: jt build --env native
105107

106108
- name: Create archive
107-
run: tar cf truffleruby-native.tar truffleruby-native
108-
working-directory: build/mxbuild
109+
run: |
110+
cd $(dirname $(jt -u native graalvm-home))
111+
mv $(basename $(jt -u native graalvm-home)) truffleruby-native
112+
tar cf ${{ github.workspace }}/truffleruby-native.tar truffleruby-native
109113
- uses: actions/upload-artifact@v2
110114
with:
111115
name: truffleruby-native
112-
path: build/mxbuild/truffleruby-native.tar
116+
path: ${{ github.workspace }}/truffleruby-native.tar
113117

114118
fast_specs:
115119
name: fast specs

tool/jt.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -731,6 +731,7 @@ def help
731731
jt sync continuously synchronize changes from the Ruby source files to the GraalVM build
732732
jt idea generates IntelliJ projects
733733
jt format run eclipse code formatter
734+
jt graalvm-home prints the GraalVM home of the RUBY_SELECTOR
734735
735736
you can also put --build or --rebuild in front of any command to build or rebuild first
736737
@@ -759,6 +760,10 @@ def launcher
759760
puts ruby_launcher
760761
end
761762

763+
define_method(:'graalvm-home') do
764+
puts graalvm_home
765+
end
766+
762767
def build(*options)
763768
project = options.shift
764769
case project

0 commit comments

Comments
 (0)