From 45b5fa974435cdb25fbf4b9d2913fb87717c7e9f Mon Sep 17 00:00:00 2001 From: Juan Vasquez Date: Fri, 9 Sep 2022 15:07:08 -0500 Subject: [PATCH 1/4] Make main workflow clear --- .github/workflows/main.yml | 79 +++++--------------------------------- 1 file changed, 10 insertions(+), 69 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9e44fa1..caf2e4f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,12 +14,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - name: Setup Ruby + - uses: actions/checkout@v2 + - name: Setup Ruby 2.4 uses: ruby/setup-ruby@v1 with: ruby-version: 2.4 - bundler-cache: true - name: Build and run tests env: BUNDLE_GEMFILE: "Gemfile-Ruby-2-4" @@ -27,78 +26,20 @@ jobs: gem install bundler bundle install --jobs 4 --retry 3 bundle exec rake - test-ruby-2-5-x: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: 2.5 - bundler-cache: true - - name: Build and run tests - run: | - gem install bundler - bundle install --jobs 4 --retry 3 - bundle exec rake - test-ruby-2-6-x: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: 2.6 - bundler-cache: true - - name: Build and run tests - run: | - gem install bundler - bundle install --jobs 4 --retry 3 - bundle exec rake - test-ruby-2-7-x: - runs-on: ubuntu-latest + test-ruby: + runs-on: ${{ matrix.os }}-latest - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: 2.7 - bundler-cache: true - - name: Build and run tests - run: | - gem install bundler - bundle install --jobs 4 --retry 3 - bundle exec rake - test-ruby-3-0-x: - runs-on: ubuntu-latest + strategy: + matrix: + os: [ubuntu] + ruby: [2.5, 2.6, 2.7, 3.0, 3.1] steps: - - uses: actions/checkout@v1 - - name: Setup Ruby + - uses: actions/checkout@v2 + - name: Setup Ruby ${{ matrix.ruby-version }} uses: ruby/setup-ruby@v1 - with: - ruby-version: 3.0 - bundler-cache: true - name: Build and run tests run: | gem install bundler bundle install --jobs 4 --retry 3 bundle exec rake - test-ruby-3-1-x: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: 3.1 - bundler-cache: true - - name: Build and run tests - run: | - gem install bundler - bundle install --jobs 4 --retry 3 - bundle exec rake \ No newline at end of file From c962a7d596c09eece42623747c76b89dc498d2b9 Mon Sep 17 00:00:00 2001 From: Juan Vasquez Date: Fri, 9 Sep 2022 15:09:00 -0500 Subject: [PATCH 2/4] Fix ruby-version --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index caf2e4f..5495876 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,6 +38,8 @@ jobs: - uses: actions/checkout@v2 - name: Setup Ruby ${{ matrix.ruby-version }} uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby-version }} - name: Build and run tests run: | gem install bundler From daef45855f3d2e0680ebf8d885d405ba7315430d Mon Sep 17 00:00:00 2001 From: Juan Vasquez Date: Fri, 9 Sep 2022 15:11:58 -0500 Subject: [PATCH 3/4] Fix ci --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5495876..a18e9fa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,7 +32,7 @@ jobs: strategy: matrix: os: [ubuntu] - ruby: [2.5, 2.6, 2.7, 3.0, 3.1] + ruby-version: [2.5, 2.6, 2.7, 3.0, 3.1] steps: - uses: actions/checkout@v2 From ff9132d3516a62ddf51f1c62ccbcd84879244076 Mon Sep 17 00:00:00 2001 From: Juan Vasquez Date: Tue, 20 Sep 2022 12:50:04 -0500 Subject: [PATCH 4/4] Add changelog record --- .github/workflows/main.yml | 6 +++--- CHANGELOG.md | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 371804a..f38b272 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: 2.4 - build-cache: true + bundler-cache: true - name: Build and run tests env: BUNDLE_GEMFILE: "Gemfile-Ruby-2-4" @@ -41,9 +41,9 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby-version }} - build-cache: true + bundler-cache: true - name: Build and run tests run: | gem install bundler bundle install --jobs 4 --retry 3 - bundle exec rake \ No newline at end of file + bundle exec rake diff --git a/CHANGELOG.md b/CHANGELOG.md index a30b33d..40036ff 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) * +* [FEATURE: Improve main workflow](https://github.com/fastruby/skunk/pull/99) * [BUGFIX: Fix analized module test](https://github.com/fastruby/skunk/pull/98) ## v0.5.2 / 2022-04-27 [(commits)](https://github.com/fastruby/skunk/compare/v0.5.1...v0.5.2)