From 2c9d3f830c4d8b8b860a24666f252e5c92b5361f Mon Sep 17 00:00:00 2001 From: Eric Date: Sun, 17 Dec 2023 16:09:12 +0100 Subject: [PATCH 1/4] Use ruby-version latest whenever possible Use rubygems default while testing --- .github/workflows/danger.yml | 2 +- .github/workflows/edge.yml | 1 - .github/workflows/test.yml | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index a8d1ba96db..c4099c1865 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -12,7 +12,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 + ruby-version: latest bundler-cache: true rubygems: latest - name: Run Danger diff --git a/.github/workflows/edge.yml b/.github/workflows/edge.yml index fe962dbff0..bea28ef249 100644 --- a/.github/workflows/edge.yml +++ b/.github/workflows/edge.yml @@ -20,7 +20,6 @@ jobs: with: ruby-version: ${{ matrix.ruby }} bundler-cache: true - rubygems: latest - name: Run tests run: bundle exec rake spec diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 150f588407..69d4e06209 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 + ruby-version: latest bundler-cache: true rubygems: latest @@ -45,7 +45,6 @@ jobs: with: ruby-version: ${{ matrix.ruby }} bundler-cache: true - rubygems: latest - name: Run tests run: bundle exec rake spec From f56f07c24a926334ced9386170e44772fe28a090 Mon Sep 17 00:00:00 2001 From: Eric Date: Sun, 17 Dec 2023 16:13:59 +0100 Subject: [PATCH 2/4] Set ruby-version to 3.2 since latest doesn't exist --- .github/workflows/danger.yml | 2 +- .github/workflows/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index c4099c1865..0fc4f1565b 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -12,7 +12,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: latest + ruby-version: 3.2 bundler-cache: true rubygems: latest - name: Run Danger diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 69d4e06209..d5db9ab2c1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: latest + ruby-version: 3.2 bundler-cache: true rubygems: latest From 1e33444bac9a5884676fdd505f2de3ad1ed9855d Mon Sep 17 00:00:00 2001 From: Eric Date: Sun, 17 Dec 2023 16:17:55 +0100 Subject: [PATCH 3/4] Set ruby-version to 2.7 for danger and keeping default rubygems-update --- .github/workflows/danger.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index 0fc4f1565b..dffe84d15a 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -12,9 +12,8 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 3.2 + ruby-version: 2.7 bundler-cache: true - rubygems: latest - name: Run Danger run: | # the token is public, has public_repo scope and belongs to the grape-bot user owned by @dblock, this is ok From fa1e65af43bdd57ac51b98911a0f011a188b533a Mon Sep 17 00:00:00 2001 From: Eric Date: Sun, 17 Dec 2023 16:25:36 +0100 Subject: [PATCH 4/4] Add CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c715cba466..76f3ce19ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ * [#2372](https://github.com/ruby-grape/grape/pull/2372): Fix `declared` method for hash params with overlapping names - [@jcagarcia](https://github.com/jcagarcia). * [#2373](https://github.com/ruby-grape/grape/pull/2373): Fix markdown files for following 1-line format - [@jcagarcia](https://github.com/jcagarcia). * [#2382](https://github.com/ruby-grape/grape/pull/2382): Fix values validator for params wrapped in `with` block - [@numbata](https://github.com/numbata). +* [#2387](https://github.com/ruby-grape/grape/pull/2387): Fix rubygems version within workflows - [@ericproulx](https://github.com/ericproulx). * Your contribution here. ### 2.0.0 (2023/11/11)