Skip to content

Commit

Permalink
Merge pull request #31 from vitekkor/30-fix-protected-branch
Browse files Browse the repository at this point in the history
30 fix protected branch
  • Loading branch information
vitekkor authored Apr 22, 2023
2 parents d637136 + 2040c03 commit dc84741
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions .github/badges/branches.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions .github/badges/jacoco.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
- name: Add coverage to PR
id: jacoco
uses: madrapps/[email protected]
if: ${{ github.event_name == 'pull_request' }}
with:
paths: ${{ github.workspace }}/blockchain/build/reports/jacoco/test/jacocoTestReport.xml
token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -42,7 +43,7 @@ jobs:
generate-branches-badge: true
jacoco-csv-file: blockchain/build/reports/jacoco/test/jacocoTestReport.csv
- name: Commit and push the badge (if it changed)
if: ${{ github.event_name != 'pull_request' }}
if: ${{ github.event_name != 'pull_request' && github.ref != 'refs/heads/master'}}
uses: EndBug/add-and-commit@v7
with:
default_author: github_actions
Expand Down

0 comments on commit dc84741

Please sign in to comment.