Skip to content

Commit

Permalink
Fix ci (#27)
Browse files Browse the repository at this point in the history
  • Loading branch information
Dennis-Nedry-From-Jurassic-Park committed Apr 22, 2022
1 parent 484f6ef commit b9734ea
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 17 deletions.
30 changes: 16 additions & 14 deletions .github/workflows/automerge.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
# https://github.com/pascalgn/automerge-action
name: "Automerge"
on:
pull_request:
types:
- labeled
- unlabeled
- synchronize
- opened
- edited
- ready_for_review
- reopened
- unlocked
check_suite:
types:
- completed
status: {}
repository_dispatch:
types: [ checks-complete ]
# pull_request:
# types:
# - labeled
# - unlabeled
# - synchronize
# - opened
# - edited
# - ready_for_review
# - reopened
# - unlocked
# check_suite:
# types:
# - completed
# status: {}

jobs:
automerge:
Expand Down
20 changes: 18 additions & 2 deletions .github/workflows/build_and_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
- name: Upload to codecov.io
uses: codecov/codecov-action@v1.0.2
with:
token: ${{secrets.GITHUB_TOKEN}}
token: ${{ secrets.GITHUB_TOKEN }}

- name: Archive code coverage results
uses: actions/upload-artifact@v1
Expand All @@ -76,4 +76,20 @@ jobs:
- uses: actions/checkout@v2
- run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }}
- run: cargo build --verbose
- run: cargo test --verbose
- run: cargo test --verbose

checks_complete:
name: Trigger automerge
runs-on: ubuntu-latest
needs:
- check
- coverage
- build_and_test
steps:
- name: Trigger automerge
uses: peter-evans/repository-dispatch@v2
with:
token: ${{ secrets.ACCESS_TOKEN }}
event-type: checks-complete
client-payload: '{"github": ${{ toJson(github) }}}'
if: github.event_name == 'pull_request'
2 changes: 1 addition & 1 deletion .github/workflows/security_audit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ jobs:
- uses: actions/checkout@v2
- uses: actions-rs/audit-check@v1.2.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
token: ${{ secrets.ACCESS_TOKEN }}

0 comments on commit b9734ea

Please sign in to comment.