Skip to content

Commit

Permalink
try new action version
Browse files Browse the repository at this point in the history
  • Loading branch information
mattseddon committed Oct 21, 2022
1 parent a217a20 commit ac9df7a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 27 deletions.
25 changes: 5 additions & 20 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,7 @@
name: Continuous Integration
on:
push:
branches:
- main
pull_request_target:

env:
SHA:
${{ github.event_name == 'pull_request_target' &&
github.event.pull_request.head.sha || github.sha }}
REF:
${{ github.event_name == 'pull_request_target' &&
github.event.pull_request.head.ref || github.ref }}
REF_NAME:
${{ github.event_name == 'pull_request_target' && github.head_ref ||
github.ref_name }}

concurrency:
group: continuous-integration-${{ github.head_ref }}
cancel-in-progress: true
Expand Down Expand Up @@ -56,24 +42,23 @@ jobs:
cache: 'yarn'

- name: Turbo cache
if: ${{ env.REF_NAME != 'main' }}
id: turbo-cache
uses: actions/cache@v3
with:
path: node_modules/.cache/turbo
key: turbo-${{ github.job }}-${{ env.REF_NAME }}-${{ env.SHA }}
key:
turbo-${{ github.job }}-${{ github.head_ref }}-${{
github.event.pull_request.head.sha }}
restore-keys: |
turbo-${{ github.job }}-${{ env.REF_NAME }}-
turbo-${{ github.job }}-${{ github.head_ref }}-
- run: yarn run install-frozen-lockfile

- run: yarn run lint

- uses: paambaati/codeclimate-action@v3.1.1
- uses: paambaati/codeclimate-action@v3.2.0
env:
CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}}
GITHUB_SHA: ${{ env.SHA }}
GITHUB_REF: ${{ env.REF }}
with:
coverageCommand: xvfb-run -a yarn run cover
coverageLocations: ${{github.workspace}}/coverage/lcov.info:lcov
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/cross-platform-test.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
name: Cross-Platform Test
on:
push:
branches:
- main
pull_request_target:

concurrency:
Expand Down Expand Up @@ -41,16 +38,15 @@ jobs:
cache: yarn

- name: Turbo cache
if: ${{ github.ref_name != 'main' }}
id: turbo-cache
uses: actions/cache@v3
with:
path: node_modules/.cache/turbo
key:
turbo-${{ runner.os }}-${{ github.job }}-${{ github.ref_name }}-${{
github.sha }}
turbo-${{ runner.os }}-${{ github.job }}-${{ github.head_ref }}-${{
github.event.pull_request.head.sha }}
restore-keys: |
turbo-${{ runner.os }}-${{ github.job }}-${{ github.ref_name }}-
turbo-${{ runner.os }}-${{ github.job }}-${{ github.head_ref }}-
- run: yarn install

Expand Down

0 comments on commit ac9df7a

Please sign in to comment.