Skip to content

Commit 5708521

Browse files
committed
Back to regular builds 4a8c5ba but keep the deduplication
1 parent 9210113 commit 5708521

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
os: [ macos-12, macos-14 ]
14-
ruby: [truffleruby-23.1.0, truffleruby-23.1.1, truffleruby-23.1.2, truffleruby-24.0.0, truffleruby-24.0.1, truffleruby-24.0.2, truffleruby-24.1.0, truffleruby-24.1.1, truffleruby+graalvm-23.1.0, truffleruby+graalvm-23.1.1, truffleruby+graalvm-23.1.2, truffleruby+graalvm-24.0.0, truffleruby+graalvm-24.0.1, truffleruby+graalvm-24.0.2, truffleruby+graalvm-24.1.0, truffleruby+graalvm-24.1.1]
13+
os: [ ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-12, macos-14 ]
14+
ruby: [jruby-9.4.9.0]
1515
runs-on: ${{ matrix.os }}
1616
steps:
1717
- uses: actions/checkout@v4
@@ -35,7 +35,7 @@ jobs:
3535
ruby="ruby-$ruby"
3636
fi
3737
echo "ruby=$ruby" >> $GITHUB_OUTPUT
38-
echo "archive=$ruby-${{ steps.platform.outputs.platform }}-fixed.tar.gz" >> $GITHUB_OUTPUT
38+
echo "archive=$ruby-${{ steps.platform.outputs.platform }}.tar.gz" >> $GITHUB_OUTPUT
3939
- name: Check if already built
4040
run: '! curl -s -L --head --fail https://github.com/ruby/ruby-builder/releases/download/${{ steps.info.outputs.tag }}/${{ steps.ruby.outputs.archive }}'
4141

@@ -90,13 +90,10 @@ jobs:
9090
run: echo 'RUBY_CONFIGURE_OPTS=--disable-shared --disable-install-doc' >> $GITHUB_ENV
9191
if: matrix.os == 'macos-14' && startsWith(steps.ruby.outputs.ruby, 'ruby-3.1')
9292

93-
- run: echo "OPENSSL_PREFIX=$(brew --prefix openssl@3)" >> $GITHUB_ENV
94-
if: startsWith(matrix.os, 'macos')
9593
- name: Build Ruby
9694
run: ruby-build --verbose ${{ steps.ruby.outputs.ruby }} $PREFIX
9795
env:
9896
CPPFLAGS: "-DENABLE_PATH_CHECK=0" # https://github.com/actions/virtual-environments/issues/267
99-
RUBY_BUILD_VENDOR_OPENSSL: "true"
10097
- name: Create archive
10198
run: tar czf ${{ steps.ruby.outputs.archive }} -C $(dirname $PREFIX) $(basename $PREFIX)
10299
- name: Install Bundler if needed
@@ -123,7 +120,7 @@ jobs:
123120
run: gh release upload "toolcache" "${{ steps.ruby.outputs.archive }}"
124121

125122
buildJRubyWindows:
126-
if: false
123+
if: true
127124
strategy:
128125
fail-fast: false
129126
matrix:

0 commit comments

Comments
 (0)