Skip to content

Commit

Permalink
Merge pull request #362 from snap-cloud/ruby-33-for-real
Browse files Browse the repository at this point in the history
Actually Update to Ruby 3.3
  • Loading branch information
cycomachead authored Aug 2, 2024
2 parents ac48e39 + 9eae777 commit a2dc6cc
Show file tree
Hide file tree
Showing 9 changed files with 125 additions and 151 deletions.
3 changes: 3 additions & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ plugins:
rubocop:
enabled: true
channel: rubocop-1-56-3
exclude_patterns:
- "vendor/"
- "lib/"
exclude_patterns:
- "bin/"
- "config/"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/next-rails.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
echo "BUNDLE_CACHE_PATH=vendor/cache.next" >> $GITHUB_ENV
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
ruby-version: 3.3.0
bundler-cache: true
- name: Prepare spec
run: |
Expand Down
21 changes: 10 additions & 11 deletions .github/workflows/spec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,12 @@ jobs:
continue-on-error: true
runs-on: ubuntu-latest
env:
PRONTO_PULL_REQUEST_ID: ${{ github.event.pull_request.number }}
PRONTO_PULL_REQUEST_ID: "${{ github.event.pull_request.number }}"
PRONTO_GITHUB_ACCESS_TOKEN: "${{ github.token }}"
steps:
- uses: actions/checkout@v2
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
bundler-cache: true
# - name: Run Pronto
# run: bundle exec pronto run
Expand All @@ -39,7 +38,6 @@ jobs:
- uses: actions/checkout@v2
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
bundler-cache: true
- name: Use Node.js
uses: actions/setup-node@v1
Expand All @@ -63,7 +61,9 @@ jobs:
- name: spec/${{ matrix.suite }}
run: |
xvfb-run --auto-servernum bundle exec rake spec:${{ matrix.suite }}
$CCTR format-coverage --output coverage/codeclimate.${{ matrix.suite }}.json --input-type simplecov
# - name: format code coverage
# run: |
# $CCTR format-coverage --output coverage/codeclimate.${{ matrix.suite }}.json --input-type simplecov
# - name: coverage upload ${{ matrix.suite }}
# uses: codacy/codacy-coverage-reporter-action@v1
# if: github.ref == 'refs/heads/master' && always()
Expand All @@ -77,10 +77,9 @@ jobs:
name: capybara-screenshots
path: tmp/capybara/
retention-days: 7

- name: Publish code coverage
run: |
export GIT_BRANCH="${GITHUB_REF/refs\/heads\//}"
$CCTR sum-coverage coverage/codeclimate.*.json
$CCTR upload-coverage --id "6d21ff1a59b134f3741779d50325f7bd5183cbe6b205051573d955705148960f"
$CCTR after-build --id "6d21ff1a59b134f3741779d50325f7bd5183cbe6b205051573d955705148960f"
# - name: Publish code coverage
# run: |
# export GIT_BRANCH="${GITHUB_REF/refs\/heads\//}"
# $CCTR sum-coverage coverage/codeclimate.*.json
# $CCTR upload-coverage --id "6d21ff1a59b134f3741779d50325f7bd5183cbe6b205051573d955705148960f"
# $CCTR after-build --id "6d21ff1a59b134f3741779d50325f7bd5183cbe6b205051573d955705148960f"
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.2
3.3.4
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ruby 3.2.2
ruby 3.3.4
nodejs 16.20.2
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ end

source 'https://rubygems.org'

ruby ENV.fetch('OSEM_RUBY_VERSION', '3.2.2')
ruby file: '.tool-versions'

# as web framework
if next?
Expand All @@ -29,7 +29,7 @@ gem 'pg'
gem 'paper_trail', '< 13'

# for upload management
gem 'carrierwave'
gem 'carrierwave', '< 3'
gem 'carrierwave-bombshelter'
gem 'mini_magick'
# for uploading images to the cloud
Expand Down Expand Up @@ -233,7 +233,7 @@ group :test do
gem 'rspec-rails'
gem 'webdrivers'
# for measuring test coverage
gem 'simplecov', '<0.18'
gem 'simplecov'
gem 'simplecov-cobertura'
# for describing models
gem 'shoulda-matchers', require: false
Expand Down
Loading

0 comments on commit a2dc6cc

Please sign in to comment.