From e06b7ad032e926d4316151066c0fcfa656c3a5a2 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 27 Feb 2020 15:44:24 +0900 Subject: Try to migrate GitHub Actions from Travis CI --- .github/workflows/ubuntu.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/ubuntu.yml diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml new file mode 100644 index 0000000000..f64dbb1844 --- /dev/null +++ b/.github/workflows/ubuntu.yml @@ -0,0 +1,35 @@ +name: ubuntu + +on: + pull_request: + + push: + branches: + - staging + - trying + +jobs: + ubuntu: + runs-on: ubuntu-latest + strategy: + matrix: + ruby: [ 2.3.8, 2.4.9, 2.5.7, 2.6.5 ] + steps: + - uses: actions/checkout@v1 + - name: Setup ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby }} + - name: Prepare dependencies + run: | + sudo apt-get install graphviz -y + bin/rake override_version + bin/rake spec:parallel_deps + - name: Run Test + run: bin/parallel_rspec spec + - name: Run Test with realworld + run: | + sudo -E bin/rake spec:sudo + sudo chown -R $(whoami) tmp + BUNDLER_SPEC_PRE_RECORDED=1 bin/rake spec:realworld + timeout-minutes: 60 -- cgit v1.2.1 From ee6e8be2d26848b27b2861b0eeb9098b3d6736a5 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 27 Feb 2020 15:59:48 +0900 Subject: USe matrix with RGV --- .github/workflows/ubuntu.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index f64dbb1844..955a6b03c0 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -14,6 +14,7 @@ jobs: strategy: matrix: ruby: [ 2.3.8, 2.4.9, 2.5.7, 2.6.5 ] + rgv: [ master, v3.0.6 ] steps: - uses: actions/checkout@v1 - name: Setup ruby @@ -27,6 +28,8 @@ jobs: bin/rake spec:parallel_deps - name: Run Test run: bin/parallel_rspec spec + env: + RGV: ${{ matrix.rgv }} - name: Run Test with realworld run: | sudo -E bin/rake spec:sudo -- cgit v1.2.1 From 9d14ce836daec7a5c4efb0af5b4da465b7d67a82 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 27 Feb 2020 16:00:25 +0900 Subject: move spec:parallel_deps with parallel_rspec --- .github/workflows/ubuntu.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 955a6b03c0..be1b9569e2 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -24,10 +24,11 @@ jobs: - name: Prepare dependencies run: | sudo apt-get install graphviz -y + - name: Run Test + run: | bin/rake override_version bin/rake spec:parallel_deps - - name: Run Test - run: bin/parallel_rspec spec + bin/parallel_rspec spec env: RGV: ${{ matrix.rgv }} - name: Run Test with realworld -- cgit v1.2.1 From 6cba4b65375d65914eb8aff16ec3c49a80a064c6 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 27 Feb 2020 16:16:38 +0900 Subject: debug --- .github/workflows/ubuntu.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index be1b9569e2..dbb9322b86 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -24,11 +24,11 @@ jobs: - name: Prepare dependencies run: | sudo apt-get install graphviz -y - - name: Run Test - run: | + gem i parallel_tests -v "~> 2.29" bin/rake override_version bin/rake spec:parallel_deps - bin/parallel_rspec spec + - name: Run Test + run: bin/parallel_rspec spec env: RGV: ${{ matrix.rgv }} - name: Run Test with realworld -- cgit v1.2.1 From c7035232c1927eaca6c680f5e6969f5616869480 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 27 Feb 2020 16:47:50 +0900 Subject: skip spec:sudo --- .github/workflows/ubuntu.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index dbb9322b86..14f17b747f 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -33,7 +33,7 @@ jobs: RGV: ${{ matrix.rgv }} - name: Run Test with realworld run: | - sudo -E bin/rake spec:sudo - sudo chown -R $(whoami) tmp - BUNDLER_SPEC_PRE_RECORDED=1 bin/rake spec:realworld + bin/rake spec:realworld + env: + BUNDLER_SPEC_PRE_RECORDED: 1 timeout-minutes: 60 -- cgit v1.2.1 From 2baf5f3296cd56aa32551c465b5da957cceb7331 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 27 Feb 2020 16:53:45 +0900 Subject: Run lint on GitHub Actions --- .github/workflows/ubuntu-lint.yml | 25 +++++++++++++++++++++++++ .travis.yml | 4 ---- 2 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/ubuntu-lint.yml diff --git a/.github/workflows/ubuntu-lint.yml b/.github/workflows/ubuntu-lint.yml new file mode 100644 index 0000000000..360ef91e85 --- /dev/null +++ b/.github/workflows/ubuntu-lint.yml @@ -0,0 +1,25 @@ +name: ubuntu-lint + +on: + pull_request: + + push: + branches: + - staging + - trying + +jobs: + ubuntu_lint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - run: git submodule update -i + - name: Setup ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: 2.6.5 + - name: Install Dependencies + run: bin/rake spec:deps + - name: Run Lint + run: bin/rake rubocop check_rvm_integration man:check + timeout-minutes: 15 diff --git a/.travis.yml b/.travis.yml index 638d19b6e1..4bcbe51a4c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,6 @@ rvm: - 2.4.9 stages: - - linting - test env: @@ -51,9 +50,6 @@ env: jobs: include: - - rvm: 2.6.5 - script: bin/rake rubocop check_rvm_integration man:check - stage: linting # Ruby 2.3 also tested in 2.x mode - rvm: 2.3.8 env: RGV=master -- cgit v1.2.1 From 30c6b0c969d09ae09832d3c9994254310d19711e Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 27 Feb 2020 17:01:37 +0900 Subject: Removed needless step --- .github/workflows/ubuntu-lint.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ubuntu-lint.yml b/.github/workflows/ubuntu-lint.yml index 360ef91e85..e2ee63d362 100644 --- a/.github/workflows/ubuntu-lint.yml +++ b/.github/workflows/ubuntu-lint.yml @@ -13,7 +13,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - run: git submodule update -i - name: Setup ruby uses: ruby/setup-ruby@v1 with: -- cgit v1.2.1 From 5a421526857f9160aeac7ae136ec0d00d539e4b1 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 27 Feb 2020 17:20:34 +0900 Subject: Run with BUNDLER_SPEC_SUB_VERSION --- .github/workflows/ubuntu.yml | 2 ++ .travis.yml | 22 ---------------------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 14f17b747f..a75d088973 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -15,6 +15,7 @@ jobs: matrix: ruby: [ 2.3.8, 2.4.9, 2.5.7, 2.6.5 ] rgv: [ master, v3.0.6 ] + bundler_version: [ 2.2.0.dev 3.0.0 ] steps: - uses: actions/checkout@v1 - name: Setup ruby @@ -31,6 +32,7 @@ jobs: run: bin/parallel_rspec spec env: RGV: ${{ matrix.rgv }} + BUNDLER_SPEC_SUB_VERSION: ${{ matrix.bundler_version }} - name: Run Test with realworld run: | bin/rake spec:realworld diff --git a/.travis.yml b/.travis.yml index 4bcbe51a4c..8db0203889 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,47 +32,25 @@ notifications: rooms: - secure: JxBi7DDJGkIF/7f/FSN/HUHpvV4EKfQccZHTPd1b2pNJn3GXo6u+tNVbAw2WjxYzPyPQI3ZcYBCU9SEXp/i7VmG8uMzh8Kyildw+miSKYKVb90uYqcsXWzbxwyNBgJLvyDkzST45H5lgnyAicee3WkFes/WDZikIajbH7ztdb04= -rvm: - - 2.6.5 - - 2.5.7 - - 2.4.9 - -stages: - - test - -env: - # We need to know if changes to rubygems will break bundler on release - - RGV=master BUNDLER_SPEC_SUB_VERSION=3.0.0 - - RGV=master - # Test the latest rubygems release with all of our supported rubies - - RGV=v3.0.6 BUNDLER_SPEC_SUB_VERSION=3.0.0 - - RGV=v3.0.6 - jobs: include: # Ruby 2.3 also tested in 2.x mode - rvm: 2.3.8 env: RGV=master - stage: test - rvm: 2.3.8 env: RGV=v3.0.6 - stage: test # Ruby 2.5, Rubygems 2.7 - rvm: 2.5.7 env: RGV=v2.7.10 - stage: test # Ruby 2.4, Rubygems 2.6 - rvm: 2.4.9 env: RGV=v2.6.14 - stage: test # Ruby 2.3, Rubygems 2.5 - rvm: 2.3.8 env: RGV=v2.5.2 - stage: test # Ruby-head (we want to know how we're doing, but not fail the build) - rvm: ruby-head env: RGV=master - stage: test allow_failures: - rvm: ruby-head -- cgit v1.2.1 From e6331fe4af7b6a6365cb7da6dcdd5517236131e1 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 27 Feb 2020 17:28:12 +0900 Subject: oops --- .github/workflows/ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index a75d088973..c708881cb2 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -15,7 +15,7 @@ jobs: matrix: ruby: [ 2.3.8, 2.4.9, 2.5.7, 2.6.5 ] rgv: [ master, v3.0.6 ] - bundler_version: [ 2.2.0.dev 3.0.0 ] + bundler_version: [ 2.2.0.dev, 3.0.0 ] steps: - uses: actions/checkout@v1 - name: Setup ruby -- cgit v1.2.1 From dffbb3d9964c18b3c3bc1465aacc62fea3df3418 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 27 Feb 2020 18:59:02 +0900 Subject: Remove trailing whitespace --- .github/workflows/ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index c708881cb2..e4737fa42f 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -37,5 +37,5 @@ jobs: run: | bin/rake spec:realworld env: - BUNDLER_SPEC_PRE_RECORDED: 1 + BUNDLER_SPEC_PRE_RECORDED: 1 timeout-minutes: 60 -- cgit v1.2.1 From a7116356e7a1c0decd8e591d0eba7d6cbebcf1d3 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 27 Feb 2020 20:03:24 +0900 Subject: Move version specified matrix to GitHub Actions --- .github/workflows/ubuntu.yml | 10 ++++++++++ .travis.yml | 14 -------------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index e4737fa42f..91b45b447a 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -16,6 +16,15 @@ jobs: ruby: [ 2.3.8, 2.4.9, 2.5.7, 2.6.5 ] rgv: [ master, v3.0.6 ] bundler_version: [ 2.2.0.dev, 3.0.0 ] + include: + - ruby: 2.3.8 + rgv: v2.5.2 + - ruby: 2.4.9 + rgv: v2.6.14 + - ruby: 2.5.7 + rgv: v2.7.10 + - ruby: head + rgv: master steps: - uses: actions/checkout@v1 - name: Setup ruby @@ -38,4 +47,5 @@ jobs: bin/rake spec:realworld env: BUNDLER_SPEC_PRE_RECORDED: 1 + continue-on-error: ${{matrix.ruby == 'head' }} timeout-minutes: 60 diff --git a/.travis.yml b/.travis.yml index 8db0203889..d4aaf2ef16 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,20 +34,6 @@ notifications: jobs: include: - # Ruby 2.3 also tested in 2.x mode - - rvm: 2.3.8 - env: RGV=master - - rvm: 2.3.8 - env: RGV=v3.0.6 - # Ruby 2.5, Rubygems 2.7 - - rvm: 2.5.7 - env: RGV=v2.7.10 - # Ruby 2.4, Rubygems 2.6 - - rvm: 2.4.9 - env: RGV=v2.6.14 - # Ruby 2.3, Rubygems 2.5 - - rvm: 2.3.8 - env: RGV=v2.5.2 # Ruby-head (we want to know how we're doing, but not fail the build) - rvm: ruby-head env: RGV=master -- cgit v1.2.1 From 47f3e54e7765390de9005686d2f20b93a4cfb378 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 27 Feb 2020 20:05:00 +0900 Subject: space --- .github/workflows/ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 91b45b447a..20e23cd4a9 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -47,5 +47,5 @@ jobs: bin/rake spec:realworld env: BUNDLER_SPEC_PRE_RECORDED: 1 - continue-on-error: ${{matrix.ruby == 'head' }} + continue-on-error: ${{ matrix.ruby == 'head' }} timeout-minutes: 60 -- cgit v1.2.1 From 9a6dcc21b32b7d0059526934638093a13856fffc Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 27 Feb 2020 20:19:44 +0900 Subject: Use exclude instead of include --- .github/workflows/ubuntu.yml | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 20e23cd4a9..aa2e6b079c 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -14,17 +14,29 @@ jobs: strategy: matrix: ruby: [ 2.3.8, 2.4.9, 2.5.7, 2.6.5 ] - rgv: [ master, v3.0.6 ] + rgv: [ v2.5.2, v2.6.14, v2.7.10, v3.0.6, master ] bundler_version: [ 2.2.0.dev, 3.0.0 ] - include: - - ruby: 2.3.8 - rgv: v2.5.2 + exclude: - ruby: 2.4.9 - rgv: v2.6.14 + rgv: v2.5.2 - ruby: 2.5.7 + rgv: v2.5.2 + - ruby: 2.5.7 + rgv: v2.6.14 + - ruby: 2.6.5 + rgv: v2.5.2 + - ruby: 2.6.5 + rgv: v2.6.14 + - ruby: 2.6.5 + rgv: v2.7.10 + - ruby: head + rgv: v2.5.2 + - ruby: head + rgv: v2.6.14 + - ruby: head rgv: v2.7.10 - ruby: head - rgv: master + rgv: v3.0.6 steps: - uses: actions/checkout@v1 - name: Setup ruby -- cgit v1.2.1 From 4cddf01182041c4893519f5831911bd736248425 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 27 Feb 2020 20:40:30 +0900 Subject: Simplify --- .github/workflows/ubuntu.yml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index aa2e6b079c..0fbb9d1df7 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -15,7 +15,25 @@ jobs: matrix: ruby: [ 2.3.8, 2.4.9, 2.5.7, 2.6.5 ] rgv: [ v2.5.2, v2.6.14, v2.7.10, v3.0.6, master ] - bundler_version: [ 2.2.0.dev, 3.0.0 ] + include: + - ruby: 2.4.9 + rgv: v3.0.6 + bundler_version: 3.0.0 + - ruby: 2.4.9 + rgv: master + bundler_version: 3.0.0 + - ruby: 2.5.7 + rgv: v3.0.6 + bundler_version: 3.0.0 + - ruby: 2.5.7 + rgv: master + bundler_version: 3.0.0 + - ruby: 2.6.5 + rgv: v3.0.6 + bundler_version: 3.0.0 + - ruby: 2.6.5 + rgv: master + bundler_version: 3.0.0 exclude: - ruby: 2.4.9 rgv: v2.5.2 -- cgit v1.2.1 From 310c5288ad20687085f900b25cf98d8cf46decbb Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 27 Feb 2020 20:49:42 +0900 Subject: Split bundler 3 jobs --- .github/workflows/ubuntu-bundler3.yml | 40 +++++++++++++++++++++++++++++++++++ .github/workflows/ubuntu.yml | 19 ----------------- 2 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 .github/workflows/ubuntu-bundler3.yml diff --git a/.github/workflows/ubuntu-bundler3.yml b/.github/workflows/ubuntu-bundler3.yml new file mode 100644 index 0000000000..5f05c27178 --- /dev/null +++ b/.github/workflows/ubuntu-bundler3.yml @@ -0,0 +1,40 @@ +name: ubuntu-bundler3 + +on: + pull_request: + + push: + branches: + - staging + - trying + +jobs: + ubuntu: + runs-on: ubuntu-latest + strategy: + matrix: + ruby: [ 2.4.9, 2.5.7, 2.6.5 ] + rgv: [ v3.0.6, master ] + steps: + - uses: actions/checkout@v1 + - name: Setup ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby }} + - name: Prepare dependencies + run: | + sudo apt-get install graphviz -y + gem i parallel_tests -v "~> 2.29" + bin/rake override_version + bin/rake spec:parallel_deps + - name: Run Test + run: bin/parallel_rspec spec + env: + RGV: ${{ matrix.rgv }} + BUNDLER_SPEC_SUB_VERSION: 3.0.0 + - name: Run Test with realworld + run: | + bin/rake spec:realworld + env: + BUNDLER_SPEC_PRE_RECORDED: 1 + timeout-minutes: 60 diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 0fbb9d1df7..6bf3d1b756 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -15,25 +15,6 @@ jobs: matrix: ruby: [ 2.3.8, 2.4.9, 2.5.7, 2.6.5 ] rgv: [ v2.5.2, v2.6.14, v2.7.10, v3.0.6, master ] - include: - - ruby: 2.4.9 - rgv: v3.0.6 - bundler_version: 3.0.0 - - ruby: 2.4.9 - rgv: master - bundler_version: 3.0.0 - - ruby: 2.5.7 - rgv: v3.0.6 - bundler_version: 3.0.0 - - ruby: 2.5.7 - rgv: master - bundler_version: 3.0.0 - - ruby: 2.6.5 - rgv: v3.0.6 - bundler_version: 3.0.0 - - ruby: 2.6.5 - rgv: master - bundler_version: 3.0.0 exclude: - ruby: 2.4.9 rgv: v2.5.2 -- cgit v1.2.1 From e9ba08085d8b8fc06b15458af6c87222e50e452c Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 27 Feb 2020 20:57:23 +0900 Subject: Migrate spec:sudo to GitHub Actions --- .github/workflows/ubuntu-sudo.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/ubuntu-sudo.yml diff --git a/.github/workflows/ubuntu-sudo.yml b/.github/workflows/ubuntu-sudo.yml new file mode 100644 index 0000000000..0ee1a0e335 --- /dev/null +++ b/.github/workflows/ubuntu-sudo.yml @@ -0,0 +1,32 @@ +name: ubuntu-sudo + +on: + pull_request: + + push: + branches: + - staging + - trying + +jobs: + ubuntu: + runs-on: ubuntu-latest + strategy: + matrix: + ruby: [ 2.4.x, 2.5.x, 2.6.x ] + rgv: [ v3.0.6, master ] + steps: + - uses: actions/checkout@v1 + - name: Setup ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby }} + - name: Prepare dependencies + run: | + bin/rake override_version + bin/rake spec:deps + - name: Run Test + run: sudo -E bin/rake spec:sudo + env: + RGV: ${{ matrix.rgv }} + timeout-minutes: 60 -- cgit v1.2.1 From c79ae7c738fabd8d6dc7310d38f092b3a0700b5b Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 27 Feb 2020 21:51:20 +0900 Subject: Remove Travis configuration --- .travis.yml | 43 ------------------------------------------- 1 file changed, 43 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d4aaf2ef16..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,43 +0,0 @@ -language: ruby -dist: bionic -script: - - bin/parallel_rspec spec - - bin/rake spec:sudo - - BUNDLER_SPEC_PRE_RECORDED=1 bin/rake spec:realworld - -before_script: - - travis_retry bin/rake override_version - - travis_retry bin/rake spec:parallel_deps - - if [ "$BUNDLER_SPEC_SUB_VERSION" = "" ]; - then - travis_retry sudo apt-get install graphviz -y; - fi - -branches: - only: - - master - - staging - - trying - - /.+-dev$/ - - /.+-stable$/ - -cache: - directories: - - tmp/rubocop - -notifications: - slack: - on_success: change - on_failure: always - rooms: - - secure: JxBi7DDJGkIF/7f/FSN/HUHpvV4EKfQccZHTPd1b2pNJn3GXo6u+tNVbAw2WjxYzPyPQI3ZcYBCU9SEXp/i7VmG8uMzh8Kyildw+miSKYKVb90uYqcsXWzbxwyNBgJLvyDkzST45H5lgnyAicee3WkFes/WDZikIajbH7ztdb04= - -jobs: - include: - # Ruby-head (we want to know how we're doing, but not fail the build) - - rvm: ruby-head - env: RGV=master - - allow_failures: - - rvm: ruby-head - env: RGV=master -- cgit v1.2.1 From a63df49e95e94e3782069d454e98172693c179ab Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 28 Feb 2020 18:34:05 +0900 Subject: Update .github/workflows/ubuntu.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: David Rodríguez --- .github/workflows/ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 6bf3d1b756..f3f9bf09f9 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ruby: [ 2.3.8, 2.4.9, 2.5.7, 2.6.5 ] + ruby: [ 2.3.8, 2.4.9, 2.5.7, 2.6.5, head ] rgv: [ v2.5.2, v2.6.14, v2.7.10, v3.0.6, master ] exclude: - ruby: 2.4.9 -- cgit v1.2.1 From d1bad9508380ed02ba41446351bca7975af31ebb Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 28 Feb 2020 18:32:32 +0900 Subject: Removed needless graphviz depends --- .github/workflows/ubuntu-bundler3.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ubuntu-bundler3.yml b/.github/workflows/ubuntu-bundler3.yml index 5f05c27178..826c52a5cc 100644 --- a/.github/workflows/ubuntu-bundler3.yml +++ b/.github/workflows/ubuntu-bundler3.yml @@ -23,7 +23,6 @@ jobs: ruby-version: ${{ matrix.ruby }} - name: Prepare dependencies run: | - sudo apt-get install graphviz -y gem i parallel_tests -v "~> 2.29" bin/rake override_version bin/rake spec:parallel_deps -- cgit v1.2.1 From 2927d44c3c5d2dc91087f047904cf92611c71656 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 28 Feb 2020 18:34:57 +0900 Subject: Removed needless env --- .github/workflows/ubuntu.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index f3f9bf09f9..dcf48bad7c 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -52,7 +52,6 @@ jobs: run: bin/parallel_rspec spec env: RGV: ${{ matrix.rgv }} - BUNDLER_SPEC_SUB_VERSION: ${{ matrix.bundler_version }} - name: Run Test with realworld run: | bin/rake spec:realworld -- cgit v1.2.1 From b4eef4fe1a2e463fbf28c2b75721ea400795c1a6 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 28 Feb 2020 18:36:20 +0900 Subject: Added RGV to spec:realworld --- .github/workflows/ubuntu-bundler3.yml | 1 + .github/workflows/ubuntu.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/ubuntu-bundler3.yml b/.github/workflows/ubuntu-bundler3.yml index 826c52a5cc..e467ec0b99 100644 --- a/.github/workflows/ubuntu-bundler3.yml +++ b/.github/workflows/ubuntu-bundler3.yml @@ -35,5 +35,6 @@ jobs: run: | bin/rake spec:realworld env: + RGV: ${{ matrix.rgv }} BUNDLER_SPEC_PRE_RECORDED: 1 timeout-minutes: 60 diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index dcf48bad7c..31debbc454 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -56,6 +56,7 @@ jobs: run: | bin/rake spec:realworld env: + RGV: ${{ matrix.rgv }} BUNDLER_SPEC_PRE_RECORDED: 1 continue-on-error: ${{ matrix.ruby == 'head' }} timeout-minutes: 60 -- cgit v1.2.1 From 05dfbf9b0352c40083af9751abab9ca9e75d06c3 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 28 Feb 2020 18:52:48 +0900 Subject: Try to remove needless installation --- .github/workflows/ubuntu-bundler3.yml | 1 - .github/workflows/ubuntu.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/ubuntu-bundler3.yml b/.github/workflows/ubuntu-bundler3.yml index e467ec0b99..b822abac1b 100644 --- a/.github/workflows/ubuntu-bundler3.yml +++ b/.github/workflows/ubuntu-bundler3.yml @@ -23,7 +23,6 @@ jobs: ruby-version: ${{ matrix.ruby }} - name: Prepare dependencies run: | - gem i parallel_tests -v "~> 2.29" bin/rake override_version bin/rake spec:parallel_deps - name: Run Test diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 31debbc454..5792ecee55 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -45,7 +45,6 @@ jobs: - name: Prepare dependencies run: | sudo apt-get install graphviz -y - gem i parallel_tests -v "~> 2.29" bin/rake override_version bin/rake spec:parallel_deps - name: Run Test -- cgit v1.2.1 From 74742cc0b74dd95877a62384ec337d870b37851b Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 28 Feb 2020 18:58:00 +0900 Subject: Revert "Try to remove needless installation" This reverts commit f018c6dd687b33c71b5ddb42c5e437704e73bd15. --- .github/workflows/ubuntu-bundler3.yml | 1 + .github/workflows/ubuntu.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/ubuntu-bundler3.yml b/.github/workflows/ubuntu-bundler3.yml index b822abac1b..e467ec0b99 100644 --- a/.github/workflows/ubuntu-bundler3.yml +++ b/.github/workflows/ubuntu-bundler3.yml @@ -23,6 +23,7 @@ jobs: ruby-version: ${{ matrix.ruby }} - name: Prepare dependencies run: | + gem i parallel_tests -v "~> 2.29" bin/rake override_version bin/rake spec:parallel_deps - name: Run Test diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 5792ecee55..31debbc454 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -45,6 +45,7 @@ jobs: - name: Prepare dependencies run: | sudo apt-get install graphviz -y + gem i parallel_tests -v "~> 2.29" bin/rake override_version bin/rake spec:parallel_deps - name: Run Test -- cgit v1.2.1 From 5f81a876d76ed1ca775c0e7f94c81fcc00784e07 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 28 Feb 2020 19:17:26 +0900 Subject: Run test with BUNDLER_SPEC_SUB_VERSION=3 --- .github/workflows/ubuntu-sudo.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ubuntu-sudo.yml b/.github/workflows/ubuntu-sudo.yml index 0ee1a0e335..719351e51f 100644 --- a/.github/workflows/ubuntu-sudo.yml +++ b/.github/workflows/ubuntu-sudo.yml @@ -29,4 +29,9 @@ jobs: run: sudo -E bin/rake spec:sudo env: RGV: ${{ matrix.rgv }} + - name: Run Test with BUNDLER_SPEC_SUB_VERSION + run: sudo -E bin/rake spec:sudo + env: + RGV: ${{ matrix.rgv }} + BUNDLER_SPEC_SUB_VERSION: 3.0.0 timeout-minutes: 60 -- cgit v1.2.1 From fe3c50bef9d1a2f8d077e64d28cbca30e39b9721 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 28 Feb 2020 19:26:16 +0900 Subject: rename --- .github/workflows/ubuntu-bundler3.yml | 2 +- .github/workflows/ubuntu-sudo.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu-bundler3.yml b/.github/workflows/ubuntu-bundler3.yml index e467ec0b99..a1be76af04 100644 --- a/.github/workflows/ubuntu-bundler3.yml +++ b/.github/workflows/ubuntu-bundler3.yml @@ -9,7 +9,7 @@ on: - trying jobs: - ubuntu: + ubuntu-bundler3: runs-on: ubuntu-latest strategy: matrix: diff --git a/.github/workflows/ubuntu-sudo.yml b/.github/workflows/ubuntu-sudo.yml index 719351e51f..27dd8e871b 100644 --- a/.github/workflows/ubuntu-sudo.yml +++ b/.github/workflows/ubuntu-sudo.yml @@ -9,7 +9,7 @@ on: - trying jobs: - ubuntu: + ubuntu-sudo: runs-on: ubuntu-latest strategy: matrix: -- cgit v1.2.1 From 99769d78b64c513d26cfe7390bacda4363eabb2e Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 28 Feb 2020 20:50:21 +0900 Subject: Simplify to install parallel gem --- .github/workflows/ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 31debbc454..9f2a402292 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -45,7 +45,7 @@ jobs: - name: Prepare dependencies run: | sudo apt-get install graphviz -y - gem i parallel_tests -v "~> 2.29" + gem i parallel --no-document bin/rake override_version bin/rake spec:parallel_deps - name: Run Test -- cgit v1.2.1 From 0de10cca73bd9e906b9bdfa730b2d10173d0df24 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 28 Feb 2020 20:51:45 +0900 Subject: Added additional dependency for Ruby 2.8 --- spec/support/rubygems_ext.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spec/support/rubygems_ext.rb b/spec/support/rubygems_ext.rb index 5299a7b447..96de64c537 100644 --- a/spec/support/rubygems_ext.rb +++ b/spec/support/rubygems_ext.rb @@ -24,6 +24,8 @@ module Spec "builder" => "~> 3.2", # ruby-graphviz is used by the viz tests "ruby-graphviz" => ">= 0.a", + # ruby-graphviz depends on rexml after Ruby 2.8 + "rexml" => ">= 0.a", } extend self -- cgit v1.2.1 From 39a40bc97bd6e1f1e247e689a0762a98c1e17c20 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 28 Feb 2020 21:38:59 +0900 Subject: Revert "Added additional dependency for Ruby 2.8" This reverts commit a39e100be885f72a261a4c78032655d13502e44e. --- spec/support/rubygems_ext.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/spec/support/rubygems_ext.rb b/spec/support/rubygems_ext.rb index 96de64c537..5299a7b447 100644 --- a/spec/support/rubygems_ext.rb +++ b/spec/support/rubygems_ext.rb @@ -24,8 +24,6 @@ module Spec "builder" => "~> 3.2", # ruby-graphviz is used by the viz tests "ruby-graphviz" => ">= 0.a", - # ruby-graphviz depends on rexml after Ruby 2.8 - "rexml" => ">= 0.a", } extend self -- cgit v1.2.1 From 08992f15a64a2afa73e237ef7476ae04dbd69377 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 28 Feb 2020 21:39:21 +0900 Subject: continue-on-error with ruby-head --- .github/workflows/ubuntu.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 9f2a402292..8fb4226238 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -52,6 +52,7 @@ jobs: run: bin/parallel_rspec spec env: RGV: ${{ matrix.rgv }} + continue-on-error: ${{ matrix.ruby == 'head' }} - name: Run Test with realworld run: | bin/rake spec:realworld -- cgit v1.2.1 From a26d34858c55ec701c1933f5c711942a5591d05d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Wed, 4 Mar 2020 13:38:58 +0100 Subject: Install dev dependencies programmatically Without shelling out. It should be faster, and it avoids a ruby 2.3 issue where gems installed through a subprocess are not picked up by the currently running rubygems. I'm also removing some unneeded `travis_retry` from the TravisCI configure. These steps shouldn't timeout and if they do, we should figure out why. Also, they could be hiding other issues not related to the network. In this case, `travis_retry bin/rake spec:parallel_deps` was hiding the issue installing dev dependencies being fixed by this commit. --- spec/support/rubygems_ext.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/spec/support/rubygems_ext.rb b/spec/support/rubygems_ext.rb index 5299a7b447..3c8d97b83c 100644 --- a/spec/support/rubygems_ext.rb +++ b/spec/support/rubygems_ext.rb @@ -105,10 +105,14 @@ module Spec end def install_gems(gems) - deps = gems.map {|name, req| "'#{name}:#{req}'" }.join(" ") - gem = ENV["GEM_COMMAND"] || "#{Gem.ruby} -S gem --backtrace" - cmd = "#{gem} install #{deps} --no-document --conservative" - system(cmd) || raise("Installing gems #{deps} for the tests to use failed!") + require "rubygems/dependency_installer" + + gems.each do |name, req| + dependency = Gem::Dependency.new(name, req) + next unless dependency.matching_specs.empty? + + Gem::DependencyInstaller.new(:document => false).install(dependency) + end end end end -- cgit v1.2.1 From 4d1096614a87c66565ed55e35ba8037b9b2eaf84 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 5 Mar 2020 20:41:08 +0900 Subject: Remove needless dependency --- .github/workflows/ubuntu-bundler3.yml | 1 - .github/workflows/ubuntu.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/ubuntu-bundler3.yml b/.github/workflows/ubuntu-bundler3.yml index a1be76af04..448c237478 100644 --- a/.github/workflows/ubuntu-bundler3.yml +++ b/.github/workflows/ubuntu-bundler3.yml @@ -23,7 +23,6 @@ jobs: ruby-version: ${{ matrix.ruby }} - name: Prepare dependencies run: | - gem i parallel_tests -v "~> 2.29" bin/rake override_version bin/rake spec:parallel_deps - name: Run Test diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 8fb4226238..2c874c74f5 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -45,7 +45,6 @@ jobs: - name: Prepare dependencies run: | sudo apt-get install graphviz -y - gem i parallel --no-document bin/rake override_version bin/rake spec:parallel_deps - name: Run Test -- cgit v1.2.1 From 75e869f047fc924bdc5d95a2750ad1d40ea2cc23 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 6 Mar 2020 07:49:05 +0900 Subject: Merge spec:sudo to ubuntu and ubuntu-bundler3 jobs --- .github/workflows/ubuntu-bundler3.yml | 6 ++++++ .github/workflows/ubuntu-sudo.yml | 37 ----------------------------------- .github/workflows/ubuntu.yml | 5 +++++ 3 files changed, 11 insertions(+), 37 deletions(-) delete mode 100644 .github/workflows/ubuntu-sudo.yml diff --git a/.github/workflows/ubuntu-bundler3.yml b/.github/workflows/ubuntu-bundler3.yml index 448c237478..b14b6f45fb 100644 --- a/.github/workflows/ubuntu-bundler3.yml +++ b/.github/workflows/ubuntu-bundler3.yml @@ -35,5 +35,11 @@ jobs: bin/rake spec:realworld env: RGV: ${{ matrix.rgv }} + BUNDLER_SPEC_SUB_VERSION: 3.0.0 BUNDLER_SPEC_PRE_RECORDED: 1 + - name: Run Test with BUNDLER_SPEC_SUB_VERSION + run: bin/rake spec:sudo + env: + RGV: ${{ matrix.rgv }} + BUNDLER_SPEC_SUB_VERSION: 3.0.0 timeout-minutes: 60 diff --git a/.github/workflows/ubuntu-sudo.yml b/.github/workflows/ubuntu-sudo.yml deleted file mode 100644 index 27dd8e871b..0000000000 --- a/.github/workflows/ubuntu-sudo.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: ubuntu-sudo - -on: - pull_request: - - push: - branches: - - staging - - trying - -jobs: - ubuntu-sudo: - runs-on: ubuntu-latest - strategy: - matrix: - ruby: [ 2.4.x, 2.5.x, 2.6.x ] - rgv: [ v3.0.6, master ] - steps: - - uses: actions/checkout@v1 - - name: Setup ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: ${{ matrix.ruby }} - - name: Prepare dependencies - run: | - bin/rake override_version - bin/rake spec:deps - - name: Run Test - run: sudo -E bin/rake spec:sudo - env: - RGV: ${{ matrix.rgv }} - - name: Run Test with BUNDLER_SPEC_SUB_VERSION - run: sudo -E bin/rake spec:sudo - env: - RGV: ${{ matrix.rgv }} - BUNDLER_SPEC_SUB_VERSION: 3.0.0 - timeout-minutes: 60 diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 2c874c74f5..def3869e53 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -59,4 +59,9 @@ jobs: RGV: ${{ matrix.rgv }} BUNDLER_SPEC_PRE_RECORDED: 1 continue-on-error: ${{ matrix.ruby == 'head' }} + - name: Run Test with sudo + run: bin/rake spec:sudo + env: + RGV: ${{ matrix.rgv }} + continue-on-error: ${{ matrix.ruby == 'head' }} timeout-minutes: 60 -- cgit v1.2.1 From 7f4df1e87ba992a69820e282a6954e5fe11cfecb Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 6 Mar 2020 07:49:29 +0900 Subject: Style --- .github/workflows/ubuntu-bundler3.yml | 3 +-- .github/workflows/ubuntu.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ubuntu-bundler3.yml b/.github/workflows/ubuntu-bundler3.yml index b14b6f45fb..ef82e5071f 100644 --- a/.github/workflows/ubuntu-bundler3.yml +++ b/.github/workflows/ubuntu-bundler3.yml @@ -31,8 +31,7 @@ jobs: RGV: ${{ matrix.rgv }} BUNDLER_SPEC_SUB_VERSION: 3.0.0 - name: Run Test with realworld - run: | - bin/rake spec:realworld + run: bin/rake spec:realworld env: RGV: ${{ matrix.rgv }} BUNDLER_SPEC_SUB_VERSION: 3.0.0 diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index def3869e53..8d63884e76 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -53,8 +53,7 @@ jobs: RGV: ${{ matrix.rgv }} continue-on-error: ${{ matrix.ruby == 'head' }} - name: Run Test with realworld - run: | - bin/rake spec:realworld + run: bin/rake spec:realworld env: RGV: ${{ matrix.rgv }} BUNDLER_SPEC_PRE_RECORDED: 1 -- cgit v1.2.1 From 4af7cc648434b415f8c546cf106cbf45d0ced327 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 6 Mar 2020 11:22:47 +0900 Subject: For Ruby 2.3 --- spec/support/rubygems_ext.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/support/rubygems_ext.rb b/spec/support/rubygems_ext.rb index 3c8d97b83c..62e2274fbe 100644 --- a/spec/support/rubygems_ext.rb +++ b/spec/support/rubygems_ext.rb @@ -23,7 +23,8 @@ module Spec "rake" => "13.0.1", "builder" => "~> 3.2", # ruby-graphviz is used by the viz tests - "ruby-graphviz" => ">= 0.a", + # for >= Ruby 2.3 + "ruby-graphviz" => "1.2.4", } extend self -- cgit v1.2.1 From 1cf561a547e129460af46be6dac5f9193c485897 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 6 Mar 2020 18:07:58 +0900 Subject: Update .github/workflows/ubuntu-bundler3.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: David Rodríguez --- .github/workflows/ubuntu-bundler3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu-bundler3.yml b/.github/workflows/ubuntu-bundler3.yml index ef82e5071f..42104a6948 100644 --- a/.github/workflows/ubuntu-bundler3.yml +++ b/.github/workflows/ubuntu-bundler3.yml @@ -23,7 +23,7 @@ jobs: ruby-version: ${{ matrix.ruby }} - name: Prepare dependencies run: | - bin/rake override_version + BUNDLER_SPEC_SUB_VERSION=3.0.0 bin/rake override_version bin/rake spec:parallel_deps - name: Run Test run: bin/parallel_rspec spec -- cgit v1.2.1 From 63917c1c9db60b87e14ffb3a8a162e4f58dc4276 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 6 Mar 2020 18:11:46 +0900 Subject: Try to use env with RGV variable in the toplevel --- .github/workflows/ubuntu-bundler3.yml | 11 +++-------- .github/workflows/ubuntu.yml | 9 +++------ 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ubuntu-bundler3.yml b/.github/workflows/ubuntu-bundler3.yml index 42104a6948..929d513677 100644 --- a/.github/workflows/ubuntu-bundler3.yml +++ b/.github/workflows/ubuntu-bundler3.yml @@ -8,6 +8,9 @@ on: - staging - trying +env: + RGV: ${{ matrix.rgv }} + jobs: ubuntu-bundler3: runs-on: ubuntu-latest @@ -27,18 +30,10 @@ jobs: bin/rake spec:parallel_deps - name: Run Test run: bin/parallel_rspec spec - env: - RGV: ${{ matrix.rgv }} - BUNDLER_SPEC_SUB_VERSION: 3.0.0 - name: Run Test with realworld run: bin/rake spec:realworld env: - RGV: ${{ matrix.rgv }} - BUNDLER_SPEC_SUB_VERSION: 3.0.0 BUNDLER_SPEC_PRE_RECORDED: 1 - name: Run Test with BUNDLER_SPEC_SUB_VERSION run: bin/rake spec:sudo - env: - RGV: ${{ matrix.rgv }} - BUNDLER_SPEC_SUB_VERSION: 3.0.0 timeout-minutes: 60 diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 8d63884e76..dd1e584ec9 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -8,6 +8,9 @@ on: - staging - trying +env: + RGV: ${{ matrix.rgv }} + jobs: ubuntu: runs-on: ubuntu-latest @@ -45,22 +48,16 @@ jobs: - name: Prepare dependencies run: | sudo apt-get install graphviz -y - bin/rake override_version bin/rake spec:parallel_deps - name: Run Test run: bin/parallel_rspec spec - env: - RGV: ${{ matrix.rgv }} continue-on-error: ${{ matrix.ruby == 'head' }} - name: Run Test with realworld run: bin/rake spec:realworld env: - RGV: ${{ matrix.rgv }} BUNDLER_SPEC_PRE_RECORDED: 1 continue-on-error: ${{ matrix.ruby == 'head' }} - name: Run Test with sudo run: bin/rake spec:sudo - env: - RGV: ${{ matrix.rgv }} continue-on-error: ${{ matrix.ruby == 'head' }} timeout-minutes: 60 -- cgit v1.2.1 From 788e2ae8d2380b2098cacf7158fb8038b9f3607a Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 6 Mar 2020 18:13:21 +0900 Subject: Revert "Try to use env with RGV variable in the toplevel" This reverts commit 63917c1c9db60b87e14ffb3a8a162e4f58dc4276. --- .github/workflows/ubuntu-bundler3.yml | 11 ++++++++--- .github/workflows/ubuntu.yml | 9 ++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ubuntu-bundler3.yml b/.github/workflows/ubuntu-bundler3.yml index 929d513677..42104a6948 100644 --- a/.github/workflows/ubuntu-bundler3.yml +++ b/.github/workflows/ubuntu-bundler3.yml @@ -8,9 +8,6 @@ on: - staging - trying -env: - RGV: ${{ matrix.rgv }} - jobs: ubuntu-bundler3: runs-on: ubuntu-latest @@ -30,10 +27,18 @@ jobs: bin/rake spec:parallel_deps - name: Run Test run: bin/parallel_rspec spec + env: + RGV: ${{ matrix.rgv }} + BUNDLER_SPEC_SUB_VERSION: 3.0.0 - name: Run Test with realworld run: bin/rake spec:realworld env: + RGV: ${{ matrix.rgv }} + BUNDLER_SPEC_SUB_VERSION: 3.0.0 BUNDLER_SPEC_PRE_RECORDED: 1 - name: Run Test with BUNDLER_SPEC_SUB_VERSION run: bin/rake spec:sudo + env: + RGV: ${{ matrix.rgv }} + BUNDLER_SPEC_SUB_VERSION: 3.0.0 timeout-minutes: 60 diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index dd1e584ec9..8d63884e76 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -8,9 +8,6 @@ on: - staging - trying -env: - RGV: ${{ matrix.rgv }} - jobs: ubuntu: runs-on: ubuntu-latest @@ -48,16 +45,22 @@ jobs: - name: Prepare dependencies run: | sudo apt-get install graphviz -y + bin/rake override_version bin/rake spec:parallel_deps - name: Run Test run: bin/parallel_rspec spec + env: + RGV: ${{ matrix.rgv }} continue-on-error: ${{ matrix.ruby == 'head' }} - name: Run Test with realworld run: bin/rake spec:realworld env: + RGV: ${{ matrix.rgv }} BUNDLER_SPEC_PRE_RECORDED: 1 continue-on-error: ${{ matrix.ruby == 'head' }} - name: Run Test with sudo run: bin/rake spec:sudo + env: + RGV: ${{ matrix.rgv }} continue-on-error: ${{ matrix.ruby == 'head' }} timeout-minutes: 60 -- cgit v1.2.1 From 925a6430ac5751abe73aa7c15b3331d99c6a698f Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 6 Mar 2020 18:14:11 +0900 Subject: Removed needless environmental variable for bundler 3 --- .github/workflows/ubuntu-bundler3.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ubuntu-bundler3.yml b/.github/workflows/ubuntu-bundler3.yml index 42104a6948..353d6e81c7 100644 --- a/.github/workflows/ubuntu-bundler3.yml +++ b/.github/workflows/ubuntu-bundler3.yml @@ -29,16 +29,13 @@ jobs: run: bin/parallel_rspec spec env: RGV: ${{ matrix.rgv }} - BUNDLER_SPEC_SUB_VERSION: 3.0.0 - name: Run Test with realworld run: bin/rake spec:realworld env: RGV: ${{ matrix.rgv }} - BUNDLER_SPEC_SUB_VERSION: 3.0.0 BUNDLER_SPEC_PRE_RECORDED: 1 - name: Run Test with BUNDLER_SPEC_SUB_VERSION run: bin/rake spec:sudo env: RGV: ${{ matrix.rgv }} - BUNDLER_SPEC_SUB_VERSION: 3.0.0 timeout-minutes: 60 -- cgit v1.2.1 From b15caa645e46a140a95123d24a4aad03c28d91aa Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 6 Mar 2020 18:17:21 +0900 Subject: Removed the needless overwrite step for bundler 2 --- .github/workflows/ubuntu.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 8d63884e76..e2b2dd24c1 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -45,7 +45,6 @@ jobs: - name: Prepare dependencies run: | sudo apt-get install graphviz -y - bin/rake override_version bin/rake spec:parallel_deps - name: Run Test run: bin/parallel_rspec spec -- cgit v1.2.1 From 3beebc67c17a135bdbdfbd4afc843146a4e3f216 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 6 Mar 2020 18:22:36 +0900 Subject: Move env with RGV under the job. --- .github/workflows/ubuntu-bundler3.yml | 7 ++----- .github/workflows/ubuntu.yml | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ubuntu-bundler3.yml b/.github/workflows/ubuntu-bundler3.yml index 353d6e81c7..f97688eda1 100644 --- a/.github/workflows/ubuntu-bundler3.yml +++ b/.github/workflows/ubuntu-bundler3.yml @@ -15,6 +15,8 @@ jobs: matrix: ruby: [ 2.4.9, 2.5.7, 2.6.5 ] rgv: [ v3.0.6, master ] + env: + RGV: ${{ matrix.rgv }} steps: - uses: actions/checkout@v1 - name: Setup ruby @@ -27,15 +29,10 @@ jobs: bin/rake spec:parallel_deps - name: Run Test run: bin/parallel_rspec spec - env: - RGV: ${{ matrix.rgv }} - name: Run Test with realworld run: bin/rake spec:realworld env: - RGV: ${{ matrix.rgv }} BUNDLER_SPEC_PRE_RECORDED: 1 - name: Run Test with BUNDLER_SPEC_SUB_VERSION run: bin/rake spec:sudo - env: - RGV: ${{ matrix.rgv }} timeout-minutes: 60 diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index e2b2dd24c1..b8f51095ed 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -36,6 +36,8 @@ jobs: rgv: v2.7.10 - ruby: head rgv: v3.0.6 + env: + RGV: ${{ matrix.rgv }} steps: - uses: actions/checkout@v1 - name: Setup ruby @@ -48,18 +50,13 @@ jobs: bin/rake spec:parallel_deps - name: Run Test run: bin/parallel_rspec spec - env: - RGV: ${{ matrix.rgv }} continue-on-error: ${{ matrix.ruby == 'head' }} - name: Run Test with realworld run: bin/rake spec:realworld env: - RGV: ${{ matrix.rgv }} BUNDLER_SPEC_PRE_RECORDED: 1 continue-on-error: ${{ matrix.ruby == 'head' }} - name: Run Test with sudo run: bin/rake spec:sudo - env: - RGV: ${{ matrix.rgv }} continue-on-error: ${{ matrix.ruby == 'head' }} timeout-minutes: 60 -- cgit v1.2.1 From 27c3fd99eab508fe36658c58371ab88e701578be Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 6 Mar 2020 18:23:14 +0900 Subject: Fixed the step name --- .github/workflows/ubuntu-bundler3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu-bundler3.yml b/.github/workflows/ubuntu-bundler3.yml index f97688eda1..fd9281ebc0 100644 --- a/.github/workflows/ubuntu-bundler3.yml +++ b/.github/workflows/ubuntu-bundler3.yml @@ -33,6 +33,6 @@ jobs: run: bin/rake spec:realworld env: BUNDLER_SPEC_PRE_RECORDED: 1 - - name: Run Test with BUNDLER_SPEC_SUB_VERSION + - name: Run Test with sudo run: bin/rake spec:sudo timeout-minutes: 60 -- cgit v1.2.1 From 148c569223ff6a7e95ac4230430191dc5c39d908 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 6 Mar 2020 18:32:27 +0900 Subject: Update bors configuration for GitHub Actions --- .github/bors.toml | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/.github/bors.toml b/.github/bors.toml index 4943eaa057..f3e8512fbb 100644 --- a/.github/bors.toml +++ b/.github/bors.toml @@ -1,8 +1,28 @@ status = [ - "continuous-integration/travis-ci/push", "windows (2.4.x)", "windows (2.5.x)", - "windows (2.6.x)" + "windows (2.6.x)", + "ubuntu_lint", + "ubuntu (2.3.8, v2.5.2)", + "ubuntu (2.3.8, v2.6.14)", + "ubuntu (2.3.8, v2.7.10)", + "ubuntu (2.3.8, v3.0.6)", + "ubuntu (2.3.8, master)", + "ubuntu (2.4.9, v2.6.14)", + "ubuntu (2.4.9, v2.7.10)", + "ubuntu (2.4.9, v3.0.6)", + "ubuntu (2.4.9, master)", + "ubuntu (2.5.7, v2.7.10)", + "ubuntu (2.5.7, v3.0.6)", + "ubuntu (2.5.7, master)", + "ubuntu (2.6.5, v3.0.6)", + "ubuntu (2.6.5, master)", + "ubuntu-bundler3 (2.4.9, v3.0.6)", + "ubuntu-bundler3 (2.4.9, master)", + "ubuntu-bundler3 (2.5.7, v3.0.6)", + "ubuntu-bundler3 (2.5.7, master)", + "ubuntu-bundler3 (2.6.5, v3.0.6)", + "ubuntu-bundler3 (2.6.5, master)" ] timeout_sec = 14400 -- cgit v1.2.1 From 48eec6db9c316257527f364c0de0fa538663a0ff Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 6 Mar 2020 18:44:13 +0900 Subject: Use GitHub Actions instead of Travis CI on the doc --- README.md | 1 - doc/development/PULL_REQUESTS.md | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 406300ae32..7df7e6651d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ [![Version ](https://img.shields.io/gem/v/bundler.svg?style=flat)](https://rubygems.org/gems/bundler) -[![Build Status](https://img.shields.io/travis/rubygems/bundler/master.svg?style=flat)](https://travis-ci.org/rubygems/bundler) [![Inline docs ](https://inch-ci.org/github/rubygems/bundler.svg?style=flat)](https://inch-ci.org/github/rubygems/bundler) [![Slack ](https://bundler-slackin.herokuapp.com/badge.svg)](https://bundler-slackin.herokuapp.com) diff --git a/doc/development/PULL_REQUESTS.md b/doc/development/PULL_REQUESTS.md index 313a885033..09428f057f 100644 --- a/doc/development/PULL_REQUESTS.md +++ b/doc/development/PULL_REQUESTS.md @@ -8,7 +8,7 @@ Before you submit a pull request, please remember to do the following: ## Code formatting -Make sure the code formatting and styling adheres to the guidelines. We use RuboCop for this. Lack of formatting adherence will result in automatic Travis build failures. +Make sure the code formatting and styling adheres to the guidelines. We use RuboCop for this. Lack of formatting adherence will result in automatic GitHub Actions build failures. $ bin/rubocop -a -- cgit v1.2.1 From f07db0495e95f7f1f4e090d1f77636b702926607 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 6 Mar 2020 18:57:12 +0900 Subject: Fixup 48eec6db9c316257527f364c0de0fa538663a0ff --- .github/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/config.yml b/.github/config.yml index 8557d7477b..31ae06970f 100644 --- a/.github/config.yml +++ b/.github/config.yml @@ -1,7 +1,7 @@ newPRWelcomeComment: | Thanks for opening a pull request and helping make Bundler better! Someone from the Bundler team will take a look at your pull request shortly and leave any feedback. Please make sure that your pull request has tests for any changes or added functionality. - We use Travis CI to test and make sure your change works functionally and uses acceptable conventions, you can review the current progress of Travis CI in the PR status window below. + We use GitHub Actions to test and make sure your change works functionally and uses acceptable conventions, you can review the current progress of GitHub Actions in the PR status window below. If you have any questions or concerns that you wish to ask, feel free to leave a comment in this PR or join our #bundler channel on [Slack](https://slack.bundler.io/). -- cgit v1.2.1