diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 27a1c6c..9f64095 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -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 }} diff --git a/.mergify.yml b/.mergify.yml index bc26191..aeea4e0 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -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: