From 4cb2a3a114b3d8eb0dfa7a6d5230d8039f538a55 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Sat, 10 Aug 2019 17:57:50 +0900 Subject: [PATCH 1/7] Added workflows for GitHub Actions. --- .github/workflows/macos.yml | 15 +++++++++++++++ .github/workflows/ubuntu-rvm.yml | 29 +++++++++++++++++++++++++++++ .github/workflows/ubuntu.yml | 22 ++++++++++++++++++++++ .github/workflows/windows.yml | 22 ++++++++++++++++++++++ 4 files changed, 88 insertions(+) create mode 100644 .github/workflows/macos.yml create mode 100644 .github/workflows/ubuntu-rvm.yml create mode 100644 .github/workflows/ubuntu.yml create mode 100644 .github/workflows/windows.yml diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml new file mode 100644 index 0000000000..240c160af3 --- /dev/null +++ b/.github/workflows/macos.yml @@ -0,0 +1,15 @@ +name: macos + +on: [push] + +jobs: + build: + runs-on: macos-latest + steps: + - uses: actions/checkout@master + - name: Install dependencies + run: | + gem install bundler + bundle install + - name: Run test + run: rake diff --git a/.github/workflows/ubuntu-rvm.yml b/.github/workflows/ubuntu-rvm.yml new file mode 100644 index 0000000000..b07549982b --- /dev/null +++ b/.github/workflows/ubuntu-rvm.yml @@ -0,0 +1,29 @@ +name: ubuntu-rvm + +on: [push] + +jobs: + build: + runs-on: ubuntu-latest + strategy: + matrix: + ruby: [ 'jruby-9.2.6.0', 'jruby-9.1.17.0', 'ruby-head' ] + steps: + - uses: actions/checkout@master + - name: Set up RVM + run: | + curl -sSL https://get.rvm.io | bash + - name: Set up Ruby + run: | + source $HOME/.rvm/scripts/rvm + rvm install ${{ matrix.ruby }} --binary + rvm --default use ${{ matrix.ruby }} + - name: Install dependencies + run: | + source $HOME/.rvm/scripts/rvm + gem install bundler + bundle install + - name: Run test + run: | + source $HOME/.rvm/scripts/rvm + rake diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml new file mode 100644 index 0000000000..a6de613a9c --- /dev/null +++ b/.github/workflows/ubuntu.yml @@ -0,0 +1,22 @@ +name: ubuntu + +on: [push] + +jobs: + build: + runs-on: ubuntu-latest + strategy: + matrix: + ruby: [ '2.6.x', '2.5.x', '2.4.x', '2.3.x' ] + steps: + - uses: actions/checkout@master + - name: Set up Ruby + uses: actions/setup-ruby@v1 + with: + version: ${{ matrix.ruby }} + - name: Install dependencies + run: | + gem install bundler + bundle install + - name: Run test + run: rake diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml new file mode 100644 index 0000000000..0b03cb4263 --- /dev/null +++ b/.github/workflows/windows.yml @@ -0,0 +1,22 @@ +name: windows + +on: [push] + +jobs: + build: + runs-on: windows-latest + strategy: + matrix: + ruby: [ '2.6.x', '2.5.x', '2.4.x' ] + steps: + - uses: actions/checkout@master + - name: Set up Ruby + uses: actions/setup-ruby@v1 + with: + version: ${{ matrix.ruby }} + - name: Install dependencies + run: | + gem install bundler + bundle install + - name: Run test + run: rake From 83d7eafdcb311e8f88eb07b65bf080d2a965f50a Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Sat, 10 Aug 2019 18:01:08 +0900 Subject: [PATCH 2/7] Use Gemfile instead of add_development_dependency. --- Gemfile | 8 ++++++++ rdoc.gemspec | 6 ------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index fa75df1563..5c5c2d2fda 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,11 @@ source 'https://rubygems.org' gemspec + +group :development do + gem "rake" + gem "racc", "> 1.4.10" + gem "kpeg" + gem "minitest", "~> 5" + gem "rubocop" +end diff --git a/rdoc.gemspec b/rdoc.gemspec index 99bf3a63f5..a6777d6899 100644 --- a/rdoc.gemspec +++ b/rdoc.gemspec @@ -53,10 +53,4 @@ RDoc includes the +rdoc+ and +ri+ tools for generating and displaying documentat s.required_ruby_version = Gem::Requirement.new(">= 2.2.2") s.rubygems_version = "2.5.2" s.required_rubygems_version = Gem::Requirement.new(">= 2.2") - - s.add_development_dependency("rake") - s.add_development_dependency("racc", "> 1.4.10") - s.add_development_dependency("kpeg") - s.add_development_dependency("minitest", "~> 5") - s.add_development_dependency("rubocop") end From fad853276191513ed1beb6e29fb969572024d7a3 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Sat, 10 Aug 2019 18:02:32 +0900 Subject: [PATCH 3/7] Use test-unit instead of minitest. --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 5c5c2d2fda..b020273f36 100644 --- a/Gemfile +++ b/Gemfile @@ -6,6 +6,6 @@ group :development do gem "rake" gem "racc", "> 1.4.10" gem "kpeg" - gem "minitest", "~> 5" + gem "test-unit" gem "rubocop" end From f7614077cea552ba870f8bf8a6f5936cfdd5dddf Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Sat, 10 Aug 2019 18:13:26 +0900 Subject: [PATCH 4/7] Split Set up bundler and install tasks. --- .github/workflows/windows.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 0b03cb4263..4e2ac4de30 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -14,9 +14,9 @@ jobs: uses: actions/setup-ruby@v1 with: version: ${{ matrix.ruby }} + - name: Set up Bundler + run: gem install bundler - name: Install dependencies - run: | - gem install bundler - bundle install + run: bundle install - name: Run test run: rake From cc9c5fe40146b0ac0f35c0e45b954e15bce617a2 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Sat, 10 Aug 2019 18:15:48 +0900 Subject: [PATCH 5/7] Ignore document generation. --- .github/workflows/macos.yml | 2 +- .github/workflows/ubuntu-rvm.yml | 2 +- .github/workflows/ubuntu.yml | 2 +- .github/workflows/windows.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 240c160af3..e161bdd4f3 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -9,7 +9,7 @@ jobs: - uses: actions/checkout@master - name: Install dependencies run: | - gem install bundler + gem install bundler --no-document bundle install - name: Run test run: rake diff --git a/.github/workflows/ubuntu-rvm.yml b/.github/workflows/ubuntu-rvm.yml index b07549982b..b27cfd44e5 100644 --- a/.github/workflows/ubuntu-rvm.yml +++ b/.github/workflows/ubuntu-rvm.yml @@ -21,7 +21,7 @@ jobs: - name: Install dependencies run: | source $HOME/.rvm/scripts/rvm - gem install bundler + gem install bundler --no-document bundle install - name: Run test run: | diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index a6de613a9c..6f08a83341 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -16,7 +16,7 @@ jobs: version: ${{ matrix.ruby }} - name: Install dependencies run: | - gem install bundler + gem install bundler --no-document bundle install - name: Run test run: rake diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 4e2ac4de30..fd22991df6 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -15,7 +15,7 @@ jobs: with: version: ${{ matrix.ruby }} - name: Set up Bundler - run: gem install bundler + run: gem install bundler --no-document - name: Install dependencies run: bundle install - name: Run test From 6153d1bea096702d14d755211f87c3a4ddff1802 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Sat, 10 Aug 2019 18:19:00 +0900 Subject: [PATCH 6/7] Removed deprecated CI configurations. --- .travis.yml | 22 ---------------------- appveyor.yml | 40 ---------------------------------------- azure-pipelines.yml | 11 ----------- 3 files changed, 73 deletions(-) delete mode 100644 .travis.yml delete mode 100644 appveyor.yml delete mode 100644 azure-pipelines.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 0a2e5bc5e8..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -before_install: - - gem update --system - - gem update bundler -language: ruby -rvm: - - 2.3.8 - - 2.4.6 - - 2.5.5 - - 2.6.3 - - ruby-head - - jruby-9.1.17.0 - - jruby-9.2.6.0 -env: - global: - NOBENCHMARK=1 -script: rake -matrix: - allow_failures: - - rvm: jruby-9.1.17.0 - - rvm: jruby-9.2.6.0 - - rvm: ruby-head diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 332d7ab538..0000000000 --- a/appveyor.yml +++ /dev/null @@ -1,40 +0,0 @@ ---- -image: Visual Studio 2017 - -clone_depth: 50 - -init: - # Set UTF-8 to use Unicode property because the default encoding on AppVeyor is Encoding::IBM437 - - set RUBYOPT=-EUTF-8 - # To avoid duplicated executables in PATH, see https://github.com/ruby/spec/pull/468 - - set PATH=C:\Ruby%ruby_version%\bin;C:\msys64\usr\bin;C:\Program Files\7-Zip;C:\Program Files\AppVeyor\BuildAgent;C:\Program Files\Git\cmd;C:\Windows\system32;C:\Program Files;C:\Windows - # Loads trunk build and updates MSYS2 / MinGW to most recent gcc compiler - - if %ruby_version%==_trunk ( - appveyor DownloadFile %APPVEYOR_URL%/api/projects/MSP-Greg/ruby-loco/artifacts/ruby_trunk.7z -FileName C:\ruby_trunk.7z & - 7z x C:\ruby_trunk.7z -oC:\Ruby_trunk) - -install: - - bundle install - -build: off - -test_script: - - rake - -on_finish: - - "echo Build Image %APPVEYOR_BUILD_WORKER_IMAGE% & ruby -v" - -deploy: off - -environment: - NOBENCHMARK: 1 - matrix: - - ruby_version: 23 - - ruby_version: 23-x64 - - ruby_version: 24 - - ruby_version: 24-x64 - - ruby_version: 25 - - ruby_version: 25-x64 - - ruby_version: 26 - - ruby_version: 26-x64 - - ruby_version: _trunk diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index 1d3ec008ec..0000000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,11 +0,0 @@ -jobs: -- job: macOS - pool: - vmImage: 'macos-10.13' - steps: - - script: | - gem install bundler - bundle install --retry=3 --jobs=4 - displayName: 'bundle install' - - script: rake - displayName: 'rake' From b76a505aeef09570b893471b85e047d19be3c8e9 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Sat, 10 Aug 2019 18:36:59 +0900 Subject: [PATCH 7/7] Added minitest for test_rdoc_rubygems_hook.rb. --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index b020273f36..4813c63655 100644 --- a/Gemfile +++ b/Gemfile @@ -7,5 +7,6 @@ group :development do gem "racc", "> 1.4.10" gem "kpeg" gem "test-unit" + gem "minitest" # for test_rdoc_rubygems_hook.rb gem "rubocop" end