diff --git a/.circleci/config.yml b/.circleci/config.yml index 35d24711..f09a382a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -34,5 +34,5 @@ jobs: command: CI_REPORTS=spec/reports RAILS_ENV=test COVERAGE=true bundle exec rake ci:setup:rspec spec - run: name: Send reports to testspace - command: testspace @.testspace.txt + command: testspace @.testspace.txt --link=coveralls when: always diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b41bd098..29ad4ba3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,18 +6,16 @@ on: jobs: build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - uses: ruby/setup-ruby@v1 with: ruby-version: '2.3' - - uses: actions/checkout@v2 - with: - fetch-depth: 50 + - uses: actions/checkout@v3 - uses: testspace-com/setup-testspace@v1 with: domain: samples - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: vendor/bundle key: ${{ runner.os }}-gems-${{ hashFiles('Gemfile.lock') }} @@ -33,9 +31,11 @@ jobs: bundle exec brakeman -o tmp/brakeman.json bundle exec brakeman_translate_checkstyle_format translate --file="tmp/brakeman.json" > tmp/brakeman_checkstyle.xml - name: Test + env: + COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | CI_REPORTS=spec/reports RAILS_ENV=test COVERAGE=true xvfb-run --server-args="-screen 0 1024x768x24" bundle exec rake ci:setup:rspec spec - name: Push run: | - testspace @.testspace.txt + testspace @.testspace.txt --link=coveralls if: always() diff --git a/Gemfile.lock b/Gemfile.lock index 85cde1cf..16c7e18f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -31,7 +31,7 @@ GEM public_suffix (>= 2.0.2, < 4.0) arel (5.0.1.20140414130214) ast (2.3.0) - bcrypt (3.1.11) + bcrypt (3.1.18) bootstrap-sass (3.1.1.1) sass (~> 3.2) brakeman (3.7.2)