diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f38b272..27ec13e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,4 +1,4 @@ -# .github/workflows/ci.yml +# .github/workflows/main.yml name: CI on: @@ -12,7 +12,6 @@ on: jobs: test-ruby-2-4-x: runs-on: ubuntu-latest - steps: - uses: actions/checkout@v2 - name: Setup Ruby 2.4 @@ -24,17 +23,31 @@ jobs: env: BUNDLE_GEMFILE: "Gemfile-Ruby-2-4" run: | - gem install bundler + gem install bundler -v 2.3 bundle install --jobs 4 --retry 3 bundle exec rake + + test-ruby-2-5-x: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Setup Ruby 2.5 + uses: ruby/setup-ruby@v1 + with: + ruby-version: 2.5 + bundler-cache: true + - name: Build and run tests + run: | + gem install bundler -v 2.3.26 + bundle install --jobs 4 --retry 3 + bundle exec rake + test-ruby: runs-on: ${{ matrix.os }}-latest - strategy: matrix: os: [ubuntu] - ruby-version: [2.5, 2.6, 2.7, 3.0, 3.1] - + ruby-version: [2.6, 2.7, "3.0", 3.1] steps: - uses: actions/checkout@v2 - name: Setup Ruby ${{ matrix.ruby-version }} @@ -44,6 +57,6 @@ jobs: bundler-cache: true - name: Build and run tests run: | - gem install bundler + gem install bundler -v 2.4.6 bundle install --jobs 4 --retry 3 bundle exec rake diff --git a/.github/workflows/skunk.yml b/.github/workflows/skunk.yml index e8a2ffd..839e707 100644 --- a/.github/workflows/skunk.yml +++ b/.github/workflows/skunk.yml @@ -6,11 +6,12 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Setup Ruby - uses: actions/setup-ruby@v1 + uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6.x + ruby-version: 2.6 + bundler-cache: true - name: Run test suite with COVERAGE=true run: | gem install bundler diff --git a/CHANGELOG.md b/CHANGELOG.md index f8dddc3..0526208 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## main [(unreleased)](https://github.com/fastruby/skunk/compare/v0.5.2...HEAD) * +* [BUGFIX: Fix skunk workflow](https://github.com/fastruby/skunk/pull/104) * [BUGFIX: Fix documentation and refactor `skunk_score` method](https://github.com/fastruby/skunk/pull/102) * [FEATURE: Improve main workflow](https://github.com/fastruby/skunk/pull/99) * [BUGFIX: Fix analized module test](https://github.com/fastruby/skunk/pull/98)