Skip to content

Commit 845a16d

Browse files
authored
Merge pull request #151 from funktechno/f/updates
ignore major for npm
2 parents 3aa58d9 + 9ddc143 commit 845a16d

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ updates:
1414
- "dependencies"
1515
- "npm"
1616
rebase-strategy: "auto"
17+
ignore:
18+
- dependency-name: "*"
19+
update-types:
20+
- "version-update:semver-major"
1721

1822
- package-ecosystem: "github-actions"
1923
directory: "/"

.github/workflows/tests.yaml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ on:
1010
env:
1111
retention_days: 3
1212

13+
permissions:
14+
checks: write
15+
contents: read
16+
pull-requests: write
17+
security-events: write # required for SARIF upload
18+
actions: read
19+
1320
jobs:
1421
tests:
1522
runs-on: ubuntu-latest
@@ -103,34 +110,24 @@ jobs:
103110
retention-days: ${{ env.retention_days }}
104111
# displays in summary page
105112
- name: Publish Test Report
106-
uses: mikepenz/action-junit-report@v3
107-
if: always() # always run even if the previous step fails
108-
with:
109-
report_paths: 'junit.xml'
110-
# more in depth junit in console and annotations on failures
111-
- uses: ashley-taylor/junit-report-annotations-action@1.3
112113
if: always()
114+
uses: EnricoMi/publish-unit-test-result-action@v2
113115
with:
114-
access-token: ${{ secrets.GITHUB_TOKEN }}
115-
path: junit.xml
116+
files: junit.xml
117+
check_name: Test Results
116118
- run: npm run test:coverage
117119
- name: upload code coverage
118120
uses: actions/upload-artifact@v4
119121
with:
120122
name: Report-CodeCoverage
121123
path: coverage
122124
retention-days: ${{ env.retention_days }}
123-
# adds coverage comment to pr
124-
- name: parse coverage
125-
uses: danhunsaker/clover-reporter-action@v0.2.17-clover
126-
with:
127-
github-token: ${{ secrets.GITHUB_TOKEN }}
128-
clover-file: ./coverage/clover.xml
125+
129126

130127
automerge:
131128
needs: tests
132129
name: Auto-merge PR if tests pass
133-
if: (github.actor == 'dependabot[bot]' || github.actor == 'imgbot[bot]') && needs.tests.result == 'success'
130+
if: (github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || github.actor == 'imgbot[bot]') && needs.tests.result == 'success'
134131
runs-on: ubuntu-latest
135132
steps:
136133
- name: Merge PR

0 commit comments

Comments
 (0)