.github/workflows/ci.yml in waterdrop-2.6.11 vs .github/workflows/ci.yml in waterdrop-2.6.12
- old
+ new
@@ -1,8 +1,10 @@
name: ci
-concurrency: ci-${{ github.ref }}
+concurrency:
+ group: ${{ github.workflow }}-${{ github.ref }}
+ cancel-in-progress: true
on:
pull_request:
push:
schedule:
@@ -14,17 +16,17 @@
needs: diffend
strategy:
fail-fast: false
matrix:
ruby:
- - '3.3.0-preview2'
+ - '3.3'
- '3.2'
- '3.1'
- '3.0'
- '2.7'
include:
- - ruby: '3.2'
+ - ruby: '3.3'
coverage: 'true'
steps:
- uses: actions/checkout@v4
- name: Install package dependencies
@@ -33,10 +35,11 @@
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{matrix.ruby}}
bundler-cache: true
+ bundler: 'latest'
- name: Run Kafka with docker-compose
run: |
docker-compose up -d || (sleep 5 && docker-compose up -d)
@@ -44,18 +47,30 @@
run: |
sleep 15
- name: Install latest bundler
run: |
- gem install bundler --no-document
+ if [[ "$(ruby -v | awk '{print $2}')" == 2.7.8* ]]; then
+ gem install bundler -v 2.4.22 --no-document
+ gem update --system 3.4.22 --no-document
+ else
+ gem install bundler --no-document
+ gem update --system --no-document
+ fi
+
bundle config set without 'tools benchmarks docs'
- name: Bundle install
run: |
bundle config set without development
- bundle install --jobs 4 --retry 3
+ if [[ "$(ruby -v | awk '{print $2}')" == 2.7.8* ]]; then
+ BUNDLER_VERSION=2.4.22 bundle install --jobs 4 --retry 3
+ else
+ bundle install --jobs 4 --retry 3
+ fi
+
- name: Run all tests
env:
GITHUB_COVERAGE: ${{matrix.coverage}}
run: bundle exec rspec
@@ -68,10 +83,10 @@
with:
fetch-depth: 0
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
- ruby-version: 3.2
+ ruby-version: 3.3
- name: Install latest bundler
run: gem install bundler --no-document
- name: Install Diffend plugin
run: bundle plugin install diffend
- name: Bundle Secure