Skip to content

Commit

Permalink
latest ruby - remove mailing conditional (#1693)
Browse files Browse the repository at this point in the history
* latest ruby - remove mailing conditional

* no longer delete lockfile

* platform for GH CI
  • Loading branch information
nelsonwittwer committed May 19, 2023
1 parent 5c611a4 commit 0ca04aa
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 10 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ jobs:
# 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 .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.3
3.2.2
7 changes: 0 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,6 @@ 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
2 changes: 2 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,9 @@ GEM

PLATFORMS
arm64-darwin-21
arm64-darwin-22
x86_64-darwin-19
x86_64-darwin-20
x86_64-darwin-21
x86_64-linux

Expand Down

0 comments on commit 0ca04aa

Please sign in to comment.