diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8be7b6a..6279c79 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,6 +10,9 @@ updates: update-types: - minor - patch + commit-message: + prefix: chore + include: scope - package-ecosystem: github-actions directory: / schedule: @@ -19,3 +22,6 @@ updates: update-types: - minor - patch + commit-message: + prefix: chore + include: scope diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 84f6193..e035b24 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,3 +16,21 @@ jobs: issues: write secrets: token: ${{ secrets.RELEASE_PLEASE_TOKEN }} + release-pr-ci: + needs: release + if: ${{ needs.release.outputs.pr_branch != '' }} + runs-on: ubuntu-latest + permissions: + actions: write + steps: + - env: + GH_TOKEN: ${{ github.token }} + BRANCH: ${{ needs.release.outputs.pr_branch }} + run: | + for attempt in 1 2 3 4 5 6; do + ids=$(gh api "repos/$GITHUB_REPOSITORY/actions/runs?branch=$BRANCH&event=pull_request&status=action_required" --jq '.workflow_runs[].id') + [ -n "$ids" ] && break + sleep 10 + done + if [ -z "$ids" ]; then echo "::notice::no held runs for $BRANCH"; fi + for id in $ids; do gh api -X POST "repos/$GITHUB_REPOSITORY/actions/runs/$id/approve"; done diff --git a/.repokeeper.yml b/.repokeeper.yml index c0db177..5e4fd20 100644 --- a/.repokeeper.yml +++ b/.repokeeper.yml @@ -1,6 +1,6 @@ # repokeeper configuration: https://github.com/vannt-dev/repokeeper schema: 1 -standard: 1.3.0 +standard: 1.4.1 platform: github stacks: - rust diff --git a/.repokeeper/lock.json b/.repokeeper/lock.json index 3ae627f..fe69b0f 100644 --- a/.repokeeper/lock.json +++ b/.repokeeper/lock.json @@ -1,6 +1,6 @@ { "lockVersion": 1, - "standard": "1.3.0", + "standard": "1.4.1", "entries": [ { "id": "block:.gitattributes#editorconfig", @@ -45,7 +45,7 @@ { "id": "file:.github/dependabot.yml", "module": "deps", - "hash": "fdccaf6b537989f7e5a1795c6801bacf1b0126e31083c396f4f96a54c83e92b7", + "hash": "c248f603e8dc7f7c18f2405e40f425570f925fe8833aa3ce33e3d1315c867d1d", "target": { "kind": "file", "path": ".github/dependabot.yml" @@ -233,6 +233,19 @@ ] } }, + { + "id": "yaml:.github/workflows/release.yml#[\"jobs\",\"release-pr-ci\"]", + "module": "release", + "hash": "6947fbe0732aa7cd806b68053d40c62cdc538fe529a119a0f52a7725a1f38d7a", + "target": { + "kind": "yaml", + "path": ".github/workflows/release.yml", + "keyPath": [ + "jobs", + "release-pr-ci" + ] + } + }, { "id": "yaml:.github/workflows/release.yml#[\"jobs\",\"release\"]", "module": "release",