From d74937fd15b06bd3c8bc2160b045bf964e42508e Mon Sep 17 00:00:00 2001 From: Ivailo Petrov Date: Wed, 10 Mar 2021 23:42:41 -0800 Subject: [PATCH 1/9] enable coveralls for CircleCI --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 49829c5ba5166d4bd43aa92454b4137fa95802c5 Mon Sep 17 00:00:00 2001 From: Ivailo Petrov Date: Wed, 10 Mar 2021 23:43:59 -0800 Subject: [PATCH 2/9] [skip travis] enable coveralls for GH Actions --- .github/workflows/ci.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b41bd098..cddfeb1b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,9 +33,16 @@ 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: + CI_NAME: github + CI_BUILD_NUMBER: ${{ env.GITHUB_RUN_NUMBER }} + CI_JOB_ID: ${{ env.GITHUB_RUN_ID }} + CI_BUILD_URL: "${{ env.GITHUB_SERVER_URL }}/${{ env.GITHUB_REPOSITORY }}/actions/runs/${{ env.GITHUB_RUN_ID }}" + CI_BRANCH: ${{ env.GITHUB_REF }} + #CI_PULL_REQUEST: ${{ env.GITHUB_RUN_ID }} 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() From 22f016606b7df12d6968beb20e1462f38d8417b4 Mon Sep 17 00:00:00 2001 From: Ivailo Petrov Date: Thu, 11 Mar 2021 00:07:12 -0800 Subject: [PATCH 3/9] [skip travis] correct coveralls for GH --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cddfeb1b..c8fb9540 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,12 +35,12 @@ jobs: - name: Test env: CI_NAME: github - CI_BUILD_NUMBER: ${{ env.GITHUB_RUN_NUMBER }} - CI_JOB_ID: ${{ env.GITHUB_RUN_ID }} - CI_BUILD_URL: "${{ env.GITHUB_SERVER_URL }}/${{ env.GITHUB_REPOSITORY }}/actions/runs/${{ env.GITHUB_RUN_ID }}" - CI_BRANCH: ${{ env.GITHUB_REF }} - #CI_PULL_REQUEST: ${{ env.GITHUB_RUN_ID }} run: | + export CI_BUILD_NUMBER=${GITHUB_RUN_NUMBER} + export CI_JOB_ID=${GITHUB_RUN_ID} + export CI_BUILD_URL="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}" + export CI_BRANCH=${GITHUB_REF#refs/heads/} + #export CI_PULL_REQUEST=`jq -r .number "${GITHUB_EVENT_PATH}"` 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: | From 2b9de264ec303f94ba76d8f26ca67bc46fb643ad Mon Sep 17 00:00:00 2001 From: Ivailo Petrov Date: Thu, 11 Mar 2021 00:31:35 -0800 Subject: [PATCH 4/9] [skip travis] correct GH env --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c8fb9540..e9935e1e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: CI_NAME: github run: | export CI_BUILD_NUMBER=${GITHUB_RUN_NUMBER} - export CI_JOB_ID=${GITHUB_RUN_ID} + export CI_JOB_ID=${GITHUB_JOB} export CI_BUILD_URL="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}" export CI_BRANCH=${GITHUB_REF#refs/heads/} #export CI_PULL_REQUEST=`jq -r .number "${GITHUB_EVENT_PATH}"` From 38d9c1692c89cf8f1c525daf357b03ca7bbf5f2c Mon Sep 17 00:00:00 2001 From: Ivailo Petrov Date: Thu, 11 Mar 2021 00:37:06 -0800 Subject: [PATCH 5/9] [skip travis] pass coveralls token in GH --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e9935e1e..263aa7b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,6 +35,7 @@ jobs: - name: Test env: CI_NAME: github + COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} run: | export CI_BUILD_NUMBER=${GITHUB_RUN_NUMBER} export CI_JOB_ID=${GITHUB_JOB} From c607a9a207ce2ede8c1df675bee56a4fdef3132d Mon Sep 17 00:00:00 2001 From: Ivailo Petrov Date: Thu, 11 Mar 2021 00:53:27 -0800 Subject: [PATCH 6/9] [skip travis] use GITHUB_TOKEN --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 263aa7b8..bc101450 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,10 +35,10 @@ jobs: - name: Test env: CI_NAME: github - COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} + COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | export CI_BUILD_NUMBER=${GITHUB_RUN_NUMBER} - export CI_JOB_ID=${GITHUB_JOB} + export CI_JOB_ID=${GITHUB_RUN_ID} export CI_BUILD_URL="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}" export CI_BRANCH=${GITHUB_REF#refs/heads/} #export CI_PULL_REQUEST=`jq -r .number "${GITHUB_EVENT_PATH}"` From 56b88d2228ae5416ef17e6d28e28a4dd635dffc1 Mon Sep 17 00:00:00 2001 From: Ivailo Petrov <5092875+ivailop@users.noreply.github.com> Date: Sun, 25 Dec 2022 11:26:42 -0800 Subject: [PATCH 7/9] update GH image and actions versions --- .github/workflows/ci.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bc101450..a5f08e43 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') }} From 770a5d8335c1b0786988b50c9c819c2113a0761d Mon Sep 17 00:00:00 2001 From: Ivailo Petrov <5092875+ivailop@users.noreply.github.com> Date: Fri, 15 Sep 2023 13:52:48 -0700 Subject: [PATCH 8/9] update bcrypt gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From 43123f3b88216fc42ee0ed9a305189380bea0be3 Mon Sep 17 00:00:00 2001 From: Ivailo Petrov <5092875+ivailop@users.noreply.github.com> Date: Fri, 15 Sep 2023 14:25:46 -0700 Subject: [PATCH 9/9] there is no need to custom-configure GitHub Actions --- .github/workflows/ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a5f08e43..29ad4ba3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,14 +32,8 @@ jobs: bundle exec brakeman_translate_checkstyle_format translate --file="tmp/brakeman.json" > tmp/brakeman_checkstyle.xml - name: Test env: - CI_NAME: github COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - export CI_BUILD_NUMBER=${GITHUB_RUN_NUMBER} - export CI_JOB_ID=${GITHUB_RUN_ID} - export CI_BUILD_URL="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}" - export CI_BRANCH=${GITHUB_REF#refs/heads/} - #export CI_PULL_REQUEST=`jq -r .number "${GITHUB_EVENT_PATH}"` 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: |