Skip to content

Commit 37a95ee

Browse files
committed
Merge branch 'develop' into dependabot/bundler/nokogiri-1.18.3
2 parents b163690 + 5f6adcf commit 37a95ee

File tree

8 files changed

+159
-116
lines changed

8 files changed

+159
-116
lines changed

.github/workflows/ruby_ci.yml

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,33 @@ jobs:
2525
MYSQL_ALLOW_EMPTY_PASSWORD: yes
2626

2727
steps:
28-
- uses: actions/checkout@v4
29-
- name: Set up Ruby
30-
uses: ruby/setup-ruby@v1
28+
- name: Checkout Repository
29+
uses: sanger/.github/.github/actions/setup/checkout@master
30+
31+
- name: Setup Ruby
32+
uses: sanger/.github/.github/actions/setup/ruby@master
33+
34+
- name: Setup stable Chrome
35+
uses: sanger/.github/.github/actions/tests/setup-chrome@master
3136
with:
32-
bundler-cache:
33-
true # Runs bundle install and caches gems. See the ruby_test.yml
34-
# example if you need more control over bundler.
35-
- name: Setup database
36-
run: bundle exec rake db:setup
37-
- name: Test & publish code coverage
38-
uses: paambaati/codeclimate-action@v8.0.0
39-
env:
40-
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID || '5e399530a457db7a41cd5785ce0536b79e9022b3c2d4382f101310b3b166eb38' }}
37+
chrome-version: 128
38+
install-chromedriver: true
39+
install-dependencies: true
40+
41+
- name: Additional setup
42+
run: bin/setup
43+
44+
- name: Run rspec
45+
run: bundle exec rspec
46+
47+
- name: Upload coverage reports to Codecov
48+
uses: sanger/.github/.github/actions/tests/codecov@master
4149
with:
42-
coverageCommand: bundle exec rspec
50+
name: ${{ github.run_id }}_${{ github.job }}_${{ github.event_name }}
51+
token: ${{ secrets.CODECOV_TOKEN }}
52+
flags: ${{ github.event_name }}
53+
disable-search: true
54+
files: ${{ github.workspace }}/lcov.info
4355

4456
lint:
4557
runs-on: ubuntu-latest

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3.6
1+
3.3.10

Gemfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ group :test do
6464
gem 'launchy'
6565
gem 'rspec-collection_matchers'
6666
gem 'rspec-rails'
67-
gem 'selenium-webdriver', '~> 4.1', require: false
67+
gem 'selenium-webdriver'
6868
gem 'simplecov', require: false
69+
gem 'simplecov-lcov', require: false
6970
gem 'timecop'
7071
end

0 commit comments

Comments
 (0)