Skip to content

Commit

Permalink
Fix build for forks. (trustwallet#3116)
Browse files Browse the repository at this point in the history
Co-authored-by: Catenocrypt <[email protected]>
  • Loading branch information
optout21 and Catenocrypt authored Aug 7, 2020
1 parent 319db19 commit 5d8ed57
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 55 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml → .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
push:
branches: [ master ]
jobs:
test:
check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/fix-dryrun.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
name: Fixes and Consistency Updates - Dry run
on:
push:
branches:
- '*'
- '!master'
pull_request:
branches: [master]
jobs:
Expand All @@ -18,9 +14,10 @@ jobs:
run: npm ci
- name: Run fix script
run: npm run fix
- name: Show fix result (diff); run 'npm run fix' locally
if: success()
run: git status
- name: Show fix result (diff); run 'npm run fix' locally
run: |
git status
git diff
- name: Run check
run: npm run check
- name: Run test
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
name: Fixes and Consistency Updates - PR
name: Fixes and Consistency Updates - Fork
on:
push:
branches:
- '*'
- '!master'
pull_request-target
branches-ignore: ['trustwallet/*']
jobs:
fix-pr:
fix-fork:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
token: ${{ secrets.GITHUB_TOKEN }}
ref: ${{ github.ref }}
- uses: actions/setup-node@v1
with:
node-version: 12
Expand All @@ -20,7 +18,9 @@ jobs:
- name: Run fix script
run: npm run fix
- name: Show fix result (diff); run 'npm run fix' locally
run: git status
run: |
git status
git diff
- name: Run check
run: npm run check
- name: Run test
Expand All @@ -31,4 +31,4 @@ jobs:
with:
commit_user_name: trust-wallet-merge-bot
commit_user_email: [email protected]
commit_message: Fixes and Consistency Updates PR
commit_message: Fixes and Consistency Updates on a Fork
35 changes: 0 additions & 35 deletions .github/workflows/fix-pr.yml

This file was deleted.

8 changes: 5 additions & 3 deletions .github/workflows/fix.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
name: Fixes and Consistency Updates
on:
push:
branches: [ master ]
branches: [ 'trustwallet/master' ]
jobs:
fix:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
token: ${{ secrets.DANGER_GITHUB_API_TOKEN }}
ref: ${{ github.head_ref }}
ref: ${{ github.ref }}
- uses: actions/setup-node@v1
with:
node-version: 12
Expand All @@ -18,7 +18,9 @@ jobs:
- name: Run fix script
run: npm run fix
- name: Show fix result (diff); run 'npm run fix' locally
run: git status
run: |
git status
git diff
- name: Run check
run: npm run check
- name: Run test
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/pr-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ jobs:
- uses: bahmutov/npm-install@v1
- name: Run check
run: npm run check
- run: npm t
- name: Run test
run: npm t

0 comments on commit 5d8ed57

Please sign in to comment.