Skip to content

Commit cd4b07f

Browse files
committed
add a grape 2.x gemfile for testing
1 parent a19df5c commit cd4b07f

File tree

3 files changed

+17
-10
lines changed

3 files changed

+17
-10
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ env:
1111
RAILS_ENV: development
1212
EMBEDDED_HTTP_SERVER_TIMEOUT: '30'
1313
WORKER_SPAWN_TIMEOUT: '15'
14-
CONFIG_DIGEST: ded80c0391f5fdf2954ab0fc646368b60605a3474cc0a719ed96c62e07792a5a
14+
CONFIG_DIGEST: 444c64919a840b6bbeded52d4d4bcc6285b3e6e6e0da9e09158aa4d0d87d201d
1515
'on':
1616
push:
1717
branches:
@@ -627,11 +627,11 @@ jobs:
627627
run: bundle exec rake
628628
needs:
629629
- ruby-3-4-default
630-
ruby-3-4-grape-1-x:
631-
name: ruby 3.4, grape-1.x
630+
ruby-3-4-grape-2-x:
631+
name: ruby 3.4, grape-2.x
632632
runs-on: ubuntu-latest
633633
if: github.ref == 'refs/heads/main' || contains(github.event.pull_request.labels.*.name,
634-
'full-ci') || contains(github.event.pull_request.labels.*.name, 'grape-1.x')
634+
'full-ci') || contains(github.event.pull_request.labels.*.name, 'grape-2.x')
635635
|| !contains(github.event.pull_request.labels.*.name, 'dependencies')
636636
services:
637637
redis:
@@ -640,7 +640,7 @@ jobs:
640640
- 6379:6379
641641
options: "--entrypoint redis-server"
642642
env:
643-
BUNDLE_GEMFILE: gemfiles/grape-1.x/Gemfile
643+
BUNDLE_GEMFILE: gemfiles/grape-2.x/Gemfile
644644
steps:
645645
- name: Checkout
646646
uses: actions/checkout@v3
@@ -656,10 +656,10 @@ jobs:
656656
uses: actions/cache@v3
657657
with:
658658
path: "${{ github.workspace }}/vendor/bundle"
659-
key: "${{ runner.os }}-gems-3.4-grape-1.x-${{ hashFiles('gemfiles/grape-1.x/Gemfile.lock')
659+
key: "${{ runner.os }}-gems-3.4-grape-2.x-${{ hashFiles('gemfiles/grape-2.x/Gemfile.lock')
660660
}}"
661661
restore-keys: |-
662-
${{ runner.os }}-gems-3.4-grape-1.x-
662+
${{ runner.os }}-gems-3.4-grape-2.x-
663663
${{ runner.os }}-gems-3.4-
664664
- name: bundle install
665665
run: "gem install bundler \nbundle install\n"
@@ -1060,7 +1060,7 @@ jobs:
10601060
- ruby-3-2-rails-7-2-x
10611061
- ruby-3-4-sinatra-2-x
10621062
- ruby-3-1-grape-1-x
1063-
- ruby-3-4-grape-1-x
1063+
- ruby-3-4-grape-2-x
10641064
- ruby-3-1-sequel-4
10651065
- ruby-3-4-sequel-5
10661066
- ruby-3-1-ams-0-9-x

gemfiles/grape-2.x/Gemfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
source "https://rubygems.org"
2+
3+
gemspec path: "../.."
4+
5+
gem "grape", "~> 2"
6+
7+
# Test additional libraries with oldest and newest versions of Grape
8+
eval_gemfile "../Gemfile.additional"

lib/tasks/workflow.rake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,7 @@ module CITasks
147147
{ always_run: true, ruby_version: NEWEST_RUBY, gemfile: "sinatra-2.x" },
148148
{ ruby_version: NEWEST_RUBY, allow_failure: true, gemfile: "sinatra-edge" },
149149
{ ruby_version: OLDEST_RUBY, gemfile: "grape-1.x" },
150-
{ always_run: true, ruby_version: NEWEST_RUBY, gemfile: "grape-1.x" },
151-
# Oldest supported grape version. Doesn't support 3.0.
150+
{ always_run: true, ruby_version: NEWEST_RUBY, gemfile: "grape-2.x" },
152151
{ ruby_version: NEWEST_RUBY, allow_failure: true, gemfile: "grape-edge" },
153152
{ ruby_version: "3.1", gemfile: "sequel-4" },
154153
{ ruby_version: NEWEST_RUBY, gemfile: "sequel-5" },

0 commit comments

Comments
 (0)