Skip to content

Commit

Permalink
Merge pull request #1386 from petergoldstein/feature/add_ruby_3_1
Browse files Browse the repository at this point in the history
Add Ruby 3.1 and 3.2 to the CI matrix
  • Loading branch information
gonzaloriestra committed Mar 28, 2023
2 parents b6ffc6e + f710fe8 commit 19739be
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 7 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,18 @@ jobs:
name: Ruby ${{ matrix.version }}
strategy:
matrix:
version: ['2.7', '3.0']
version: ['2.7', '3.0', '3.1', '3.2']

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Cache node modules
uses: actions/cache@v2
uses: actions/cache@v3
with:
# npm cache files are stored in `~/.npm` on Linux/macOS
path: ~/.npm
key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
- name: Remove Gemfile.lock
run: rm Gemfile.lock
- name: Set up Ruby ${{ matrix.version }}
uses: ruby/setup-ruby@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Extract tag name
id: tag
run: echo "::set-output name=value::${GITHUB_REF##*/}"
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Create Release
id: create_release
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/remove-labels-on-activity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
remove-labels-on-activity:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions-ecosystem/action-remove-labels@v1
if: contains(github.event.issue.labels.*.name, 'Waiting for Response')
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Ruby 2.7
uses: ruby/setup-ruby@v1
with:
Expand Down
7 changes: 7 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@ gemspec
gem "rails-controller-testing", group: :test
gem "rails", "< 7" # temporary: https://github.com/Shopify/shopify_app/pull/1561

if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.1")
# Default gems removed from stdlib in Ruby 3.1.0
gem "net-imap", require: false
gem "net-pop", require: false
gem "net-smtp", require: false
end

group :rubocop do
gem "rubocop-shopify", require: false
end
3 changes: 2 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@ GEM
PLATFORMS
arm64-darwin-21
x86_64-darwin-19
x86_64-darwin-21
x86_64-linux

DEPENDENCIES
Expand All @@ -278,4 +279,4 @@ DEPENDENCIES
webmock

BUNDLED WITH
2.3.4
2.4.10

0 comments on commit 19739be

Please sign in to comment.