[devtools] sync

Author: rom-bot

.github/workflows/ci.yml

@@ -37,10 +37,8 @@ jobs:
           rom_core_from_master: 'true'
           sequel_from_master: 'true'
     env:
-      CLASSPATH: ''
       COVERAGE: "${{matrix.coverage}}"
-      CODACY_RUN_LOCAL: true
-      CODACY_PROJECT_TOKEN: "${{secrets.CODACY_PROJECT_TOKEN}}"
+      COVERAGE_TOKEN: "${{secrets.CODACY_PROJECT_TOKEN}}"
       APT_DEPS: libpq-dev libmysqlclient-dev libsqlite3-dev
       FAIL_ON_WARNINGS: "${{matrix.fail_on_warnings}}"
       DRY_TYPES_FROM_MASTER: "${{matrix.dry_types_from_master}}"
@@ -62,6 +60,12 @@ jobs:
       run: bundle install --jobs 4 --retry 3
     - name: Run all tests
       run: bundle exec rake
+    - name: Run codacy-coverage-reporter
+      uses: codacy/codacy-coverage-reporter-action@master
+      if: env.COVERAGE == 'true' && env.COVERAGE_TOKEN != ''
+      with:
+        project-token: "${{secrets.CODACY_PROJECT_TOKEN}}"
+        coverage-reports: coverage/coverage.xml
     services:
       mysql:
         image: mysql:5.7

.github/workflows/docsite.yml

@@ -1,6 +1,6 @@
 # this file is managed by rom-rb/devtools project
 
-name: Update docs on rom-rb.org
+name: docsite
 
 on:
   push:

Gemfile.devtools

@@ -5,15 +5,13 @@
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 group :test do
-  # 0.18.x breaks codacy result parser
-  gem "simplecov", "0.17.1", require: false, platforms: :ruby
-
-  gem "codacy-coverage", require: false, platforms: :ruby
+  gem "simplecov", require: false, platforms: :ruby
+  gem "simplecov-cobertura", require: false, platforms: :ruby
 
   gem "warning" if RUBY_VERSION >= "2.4.0"
 end
 
 group :tools do
   # this is the same version that we use on codacy
-  gem "rubocop", "0.71.0"
+  gem "rubocop", "0.82.0"
 end

spec/support/coverage.rb

@@ -3,7 +3,13 @@
 # this file is managed by rom-rb/devtools
 
 if ENV["COVERAGE"] == "true"
-  require "codacy-coverage"
+  require "simplecov"
+  require "simplecov-cobertura"
 
-  Codacy::Reporter.start
+  SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
+
+  SimpleCov.start do
+    add_filter "/spec/"
+    enable_coverage :branch
+  end
 end