Skip to content

Commit f767db7

Browse files
authored
Workaround Ruby build in CI (#28)
Sometimes the compiling of `encoding.c` started before `id.h` was generated, causing building to fail.
1 parent f45753d commit f767db7

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.github/scripts/ci-build.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ pushd $BINDING_PATH
1919
esac
2020
popd
2121

22+
NUM_OF_JOBS=2
23+
2224
pushd $RUBY_PATH
2325

2426
./autogen.sh
@@ -29,12 +31,12 @@ pushd $RUBY_PATH
2931
case $DEBUG_LEVEL in
3032
debug)
3133
../configure --with-mmtk-ruby=$BINDING_PATH --with-mmtk-ruby-debug --prefix=$RUBY_INSTALL_PATH --disable-install-doc cppflags='-g3 -O0 -DRUBY_DEBUG=1 -DRUBY_DEVEL -DUSE_RUBY_DEBUG_LOG=1'
32-
make miniruby -j
34+
make miniruby -j $NUM_OF_JOBS
3335
;;
3436

3537
release)
3638
../configure --with-mmtk-ruby=$BINDING_PATH --prefix=$RUBY_INSTALL_PATH --disable-install-doc cppflags='-g3'
37-
make install -j
39+
make install -j $NUM_OF_JOBS
3840
;;
3941

4042
*)

.github/scripts/common.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,4 @@ BINDING_PATH=$(realpath $(dirname "$0"))/../..
22
RUBY_PATH=$BINDING_PATH/../ruby
33
RUBY_BUILD_PATH=$RUBY_PATH/build
44
RUBY_INSTALL_PATH=$RUBY_BUILD_PATH/install
5-
RUSTUP_TOOLCHAIN=stable
6-
# TODO: Switch to a fixed toolchain the next time we bump MSRV
7-
#RUSTUP_TOOLCHAIN=`cat $BINDING_PATH/mmtk/rust-toolchain`
5+
RUSTUP_TOOLCHAIN=`cat $BINDING_PATH/mmtk/rust-toolchain`

mmtk/rust-toolchain

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.71.1

0 commit comments

Comments
 (0)