Skip to content

Commit

Permalink
Merge pull request #281 from numtide/dependabot/github_actions/peacei…
Browse files Browse the repository at this point in the history
…ris/actions-gh-pages-4

build(deps): bump peaceiris/actions-gh-pages from 3 to 4
  • Loading branch information
Mic92 authored May 2, 2024
2 parents e514573 + 91f884d commit 0a285d3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
echo "result=$(readlink ./result)" >> $GITHUB_OUTPUT
- name: Deploy
uses: peaceiris/actions-gh-pages@v3
uses: peaceiris/actions-gh-pages@v4
if: github.ref == 'refs/heads/main'
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
9 changes: 3 additions & 6 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
queue_rules:
- name: default
merge_conditions:
- check-success=Evaluate flake.nix
- check-success=buildbot/nix-eval
- check-success=build (macos-latest)
- check-success=build (ubuntu-latest)
- check-success=build_and_test (macos-latest)
- check-success=build_and_test (ubuntu-latest)
- check-success=build_and_test (windows-2019)
- check-success=clippy
- check-success=clippy_check
- check-success=devShell default [x86_64-linux]
- check-success=gh-pages
- check-success=package default [x86_64-linux]
- check-success=package docs [x86_64-linux]
defaults:
actions:
queue:
allow_merging_configuration_change: true
method: rebase
merge_method: rebase
pull_request_rules:
- name: merge using the merge queue
conditions:
Expand Down

0 comments on commit 0a285d3

Please sign in to comment.