From da2179793e860647980c5d134eb73858708c3e9e Mon Sep 17 00:00:00 2001 From: Matt Muller Date: Mon, 26 Jul 2021 11:25:45 -0700 Subject: [PATCH 01/10] Try building 1.9 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8f8b60e5..5ec14e7e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-16.04, ubuntu-18.04, ubuntu-20.04, macos-latest ] - ruby: ["truffleruby-21.2.0"] + ruby: ["ruby-1.9.3-p551"] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 @@ -69,7 +69,7 @@ jobs: # See https://bugs.ruby-lang.org/issues/17777 for 2.6.7 - name: Set warnflags for Ruby <= 2.2 run: echo "warnflags=-Wno-error=implicit-function-declaration" >> $GITHUB_ENV - if: startsWith(matrix.ruby, 'ruby-2.0') || startsWith(matrix.ruby, 'ruby-2.1') || startsWith(matrix.ruby, 'ruby-2.2') || matrix.ruby == 'ruby-2.6.7' + if: startsWith(matrix.ruby, 'ruby-1.9') || startsWith(matrix.ruby, 'ruby-2.0') || startsWith(matrix.ruby, 'ruby-2.1') || startsWith(matrix.ruby, 'ruby-2.2') || matrix.ruby == 'ruby-2.6.7' - name: Build Ruby run: ruby-build --verbose $RUBY_BUILD_RUBY_NAME $PREFIX env: From 80e799341d09cce673306e909173c865c60fead1 Mon Sep 17 00:00:00 2001 From: Matt Muller Date: Mon, 26 Jul 2021 11:34:05 -0700 Subject: [PATCH 02/10] Use OpenSSL 1.0.2 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5ec14e7e..eb8cdfce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: # To workaround that, we use a branch of ruby-build which builds its own OpenSSL. - name: Clone ruby-build run: | - if [[ "${{ matrix.ruby }}" == ruby-2.[0123]* ]]; then + if [[ "${{ matrix.ruby }}" == ruby-2.[0123]* || "${{ matrix.ruby }}" == ruby-1.9* ]]; then git clone --branch ruby23-openssl-linux https://github.com/eregon/ruby-build.git else git clone https://github.com/rbenv/ruby-build.git From 0c385f24415c0bc0a7c9e16f0ba444052565ff92 Mon Sep 17 00:00:00 2001 From: Matt Muller Date: Mon, 26 Jul 2021 11:55:39 -0700 Subject: [PATCH 03/10] Use a fork of ruby-builder that adds 1.9 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eb8cdfce..8933095c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: - name: Clone ruby-build run: | if [[ "${{ matrix.ruby }}" == ruby-2.[0123]* || "${{ matrix.ruby }}" == ruby-1.9* ]]; then - git clone --branch ruby23-openssl-linux https://github.com/eregon/ruby-build.git + git clone --branch ruby23-openssl-linux https://github.com/mullermp/ruby-build.git else git clone https://github.com/rbenv/ruby-build.git fi From 0f07dc6dd154bb3d541905de42b56f2d14102a83 Mon Sep 17 00:00:00 2001 From: Matt Muller Date: Mon, 26 Jul 2021 12:14:47 -0700 Subject: [PATCH 04/10] Build succeeds but try and fix bundler step --- .github/workflows/build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8933095c..0f20213e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -81,7 +81,11 @@ jobs: run: | if [ ! -e $PREFIX/bin/bundle ]; then export PATH="$PREFIX/bin:$PATH" - gem install bundler -v '~> 1' --no-document + if [[ "${{ matrix.ruby }}" == ruby-1.9* ]]; then + gem install bundler -v '~>1' + else + gem install bundler -v '~> 1' --no-document + fi fi - run: echo "$PREFIX/bin" >> $GITHUB_PATH From 11118a9fa2c8b85e00f69e6b2c8413fe30b37d66 Mon Sep 17 00:00:00 2001 From: Matt Muller Date: Mon, 26 Jul 2021 12:28:07 -0700 Subject: [PATCH 05/10] Skip no-document for Ruby 1.9 --- .github/workflows/build.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0f20213e..a63842ac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -91,7 +91,12 @@ jobs: - run: echo "$PREFIX/bin" >> $GITHUB_PATH - run: ruby --version - run: ruby -ropen-uri -e 'puts URI.send(:open, %{https://rubygems.org/}) { |f| f.read(1024) }' - - run: gem install json:2.2.0 --no-document + - run: | + if [[ "${{ matrix.ruby }}" == ruby-1.9* ]]; then + gem install json:2.2.0 + else + gem install json:2.2.0 --no-document + fi - run: bundle --version - run: bundle install - run: bundle exec rake --version From 080b4cc6c70a6bc992842d6a85d99a76c3713d76 Mon Sep 17 00:00:00 2001 From: Matt Muller Date: Mon, 26 Jul 2021 12:36:21 -0700 Subject: [PATCH 06/10] Fix syntax.. oops --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a63842ac..d9fe9c6c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -91,7 +91,8 @@ jobs: - run: echo "$PREFIX/bin" >> $GITHUB_PATH - run: ruby --version - run: ruby -ropen-uri -e 'puts URI.send(:open, %{https://rubygems.org/}) { |f| f.read(1024) }' - - run: | + - name: Install JSON gem + run: | if [[ "${{ matrix.ruby }}" == ruby-1.9* ]]; then gem install json:2.2.0 else From 8fc246d22bdb6fcf42dd30bcc506a2ba350cb8b8 Mon Sep 17 00:00:00 2001 From: Matt Muller Date: Mon, 26 Jul 2021 12:43:51 -0700 Subject: [PATCH 07/10] Fix JSON install with version --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d9fe9c6c..07079115 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,7 +84,7 @@ jobs: if [[ "${{ matrix.ruby }}" == ruby-1.9* ]]; then gem install bundler -v '~>1' else - gem install bundler -v '~> 1' --no-document + gem install bundler -v '~> 1' --no-document fi fi @@ -94,9 +94,9 @@ jobs: - name: Install JSON gem run: | if [[ "${{ matrix.ruby }}" == ruby-1.9* ]]; then - gem install json:2.2.0 + gem install json -v '2.2.0' else - gem install json:2.2.0 --no-document + gem install json -v '2.2.0' --no-document fi - run: bundle --version - run: bundle install From a2fa76217a15ec803c8bed9d33262d896de4c145 Mon Sep 17 00:00:00 2001 From: Matt Muller Date: Mon, 26 Jul 2021 12:54:22 -0700 Subject: [PATCH 08/10] Revert changes so that PR can be made against main repo --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 07079115..9120fe9b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-16.04, ubuntu-18.04, ubuntu-20.04, macos-latest ] - ruby: ["ruby-1.9.3-p551"] + ruby: ["truffleruby-21.2.0"] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 @@ -28,7 +28,7 @@ jobs: - name: Clone ruby-build run: | if [[ "${{ matrix.ruby }}" == ruby-2.[0123]* || "${{ matrix.ruby }}" == ruby-1.9* ]]; then - git clone --branch ruby23-openssl-linux https://github.com/mullermp/ruby-build.git + git clone --branch ruby23-openssl-linux https://github.com/eregon/ruby-build.git else git clone https://github.com/rbenv/ruby-build.git fi From 45c2e0baa307c4670947bd5ca02a91a6d020e1db Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Sun, 1 Aug 2021 12:56:08 +0200 Subject: [PATCH 09/10] Update .github/workflows/build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9120fe9b..8ff4fd86 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -82,7 +82,7 @@ jobs: if [ ! -e $PREFIX/bin/bundle ]; then export PATH="$PREFIX/bin:$PATH" if [[ "${{ matrix.ruby }}" == ruby-1.9* ]]; then - gem install bundler -v '~>1' + gem install bundler -v '~> 1' --no-ri --no-rdoc else gem install bundler -v '~> 1' --no-document fi From 41b4c94debd9e888a903e8e61a176127ea4bcc0f Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Sun, 1 Aug 2021 12:56:13 +0200 Subject: [PATCH 10/10] Update .github/workflows/build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8ff4fd86..b1043518 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -94,7 +94,7 @@ jobs: - name: Install JSON gem run: | if [[ "${{ matrix.ruby }}" == ruby-1.9* ]]; then - gem install json -v '2.2.0' + gem install json -v '2.2.0' --no-ri --no-rdoc else gem install json -v '2.2.0' --no-document fi