From efd3fbfda90da9a2bae32c54d73bc6738a61897c Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Fri, 10 May 2024 17:25:16 +0900 Subject: [PATCH 1/3] Fix error on Ruby 3.4 (dev) drb and nkf are bundled gems on Ruby 3.4 now. --- bitclust-core.gemspec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bitclust-core.gemspec b/bitclust-core.gemspec index 68c7d66c..1f4d62cd 100644 --- a/bitclust-core.gemspec +++ b/bitclust-core.gemspec @@ -34,4 +34,6 @@ EOD s.add_runtime_dependency "rack" s.add_runtime_dependency "progressbar", ">= 1.9.0", "< 2.0" s.add_runtime_dependency "webrick" + s.add_runtime_dependency "drb" + s.add_runtime_dependency "nkf" end From eb078f4f66870d21f6a3f698b4747a31482af970 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Fri, 10 May 2024 17:28:05 +0900 Subject: [PATCH 2/3] Bump version --- lib/bitclust/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bitclust/version.rb b/lib/bitclust/version.rb index 7b64d1d0..6a530c50 100644 --- a/lib/bitclust/version.rb +++ b/lib/bitclust/version.rb @@ -1,4 +1,4 @@ # frozen_string_literal: true module BitClust - VERSION = "1.3.1" + VERSION = "1.4.0" end From 60357763fd4128eadcee1d1ded76b07003caec10 Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Fri, 10 May 2024 17:35:21 +0900 Subject: [PATCH 3/3] Update ruby versions and actions --- .github/workflows/test.yml | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 00bdbed6..79466dfd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,13 +3,24 @@ name: test on: [push, pull_request] jobs: + ruby-versions: + runs-on: ubuntu-latest + outputs: + versions: ${{ steps.versions.outputs.value }} + steps: + - id: versions + run: | + versions=$(curl -s 'https://cache.ruby-lang.org/pub/misc/ci_versions/cruby.json' | jq -c '. + []') + echo "value=${versions}" >> $GITHUB_OUTPUT + build: + needs: ruby-versions runs-on: ubuntu-latest strategy: matrix: - ruby: [ 3.1, '3.0', 2.7, 2.6, 2.5, 2.4, 2.3, ruby-head ] + ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} @@ -19,16 +30,17 @@ jobs: run: bundle exec rake rurema: + needs: ruby-versions runs-on: ubuntu-latest strategy: matrix: # NOTE: rurema/doctreeは2.5+しかサポートしていない - ruby: [ 3.1, '3.0', 2.7, 2.6, 2.5, ruby-head ] + ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: path: 'bitclust' - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: repository: 'rurema/doctree' path: 'doctree' @@ -52,7 +64,7 @@ jobs: for d in *.*; do tar acf ../artifact/$d.tar.xz $d done - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: statichtml-ubuntu-latest-${{ matrix.ruby }} path: /tmp/artifact/*.tar.xz @@ -61,7 +73,7 @@ jobs: run: | cd /tmp mv -v html html.pr - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: path: 'bitclust' ref: ${{ github.event.pull_request.base.sha }} @@ -77,7 +89,7 @@ jobs: mv -v html html.base git diff --no-index html.base html.pr --stat || true git diff --no-index html.base html.pr --output artifact/html.diff || true - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: diff-ubuntu-latest-${{ matrix.ruby }} path: /tmp/artifact/html.diff