From 90f3591744330009971a116a8d0bc100eed59ebe Mon Sep 17 00:00:00 2001 From: Frank Lam Date: Sat, 30 May 2020 11:29:31 +0800 Subject: Update CI templates * Next version of Bundler will auto choose jobs by default * --retry 3 is already default --- lib/bundler/templates/newgem/.github/workflows/main.yml.tt | 4 ++-- lib/bundler/templates/newgem/.gitlab-ci.yml.tt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/bundler/templates/newgem/.github/workflows/main.yml.tt b/lib/bundler/templates/newgem/.github/workflows/main.yml.tt index 929901ac56..5ebe3c753a 100644 --- a/lib/bundler/templates/newgem/.github/workflows/main.yml.tt +++ b/lib/bundler/templates/newgem/.github/workflows/main.yml.tt @@ -7,12 +7,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up Ruby <%= ::Gem::Version.new(RUBY_VERSION).segments[0..1].join(".") %> + - name: Set up Ruby uses: actions/setup-ruby@v1 with: ruby-version: <%= ::Gem::Version.new(RUBY_VERSION).segments[0..1].join(".") %>.x - name: Build and test with Rake run: | gem install bundler -v <%= Bundler::VERSION %> - bundle install --jobs 4 --retry 3 + bundle install bundle exec rake diff --git a/lib/bundler/templates/newgem/.gitlab-ci.yml.tt b/lib/bundler/templates/newgem/.gitlab-ci.yml.tt index 0e71ff26a4..5633276b91 100644 --- a/lib/bundler/templates/newgem/.gitlab-ci.yml.tt +++ b/lib/bundler/templates/newgem/.gitlab-ci.yml.tt @@ -4,6 +4,6 @@ before_script: - gem install bundler -v <%= Bundler::VERSION %> - bundle install -example_job: +test: script: - - bundle exec rake + - bundle exec rake test -- cgit v1.2.3