Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/heinrichreimer/git…
Browse files Browse the repository at this point in the history
…hub-changelog-generator-action-2.4
  • Loading branch information
Czaki authored Jun 20, 2024
2 parents 42c9ed6 + 143f97d commit d716e03
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
5 changes: 5 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,8 @@ updates:
interval: "weekly"
commit-message:
prefix: "ci(dependabot):"

groups:
github-actions:
patterns:
- "actions/*"
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ jobs:
if: always()
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-python@v5
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test_conversion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:

- name: Test Conversion
id: test-without-napari
uses: aganders3/headless-gui@v1
uses: aganders3/headless-gui@v2
continue-on-error: true
with:
run: npe2 convert ./plugin_repo
Expand All @@ -73,13 +73,13 @@ jobs:
- name: Test Conversion again with napari
id: test-with-napari
if: ${{ steps.test-without-napari.outcome == 'failure' }}
uses: aganders3/headless-gui@v1
uses: aganders3/headless-gui@v2
with:
run: npe2 convert ./plugin_repo

- name: Test Conversion again with napari
if: ${{ steps.test-without-napari.outcome == 'failure' && steps.test-with-napari.outcome == 'failure' }}
uses: aganders3/headless-gui@v1
uses: aganders3/headless-gui@v2
with:
# try without modifying directory
run: npe2 convert -n ${{ matrix.plugin }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update_changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
repo: napari/npe2
- name: Create Pull Request
uses: peter-evans/create-pull-request@v5
uses: peter-evans/create-pull-request@v6
with:
token: ${{ secrets.GITHUB_TOKEN }}
commit-message: Automatic changelog update
Expand Down

0 comments on commit d716e03

Please sign in to comment.