diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4eb7f42b..98086942 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,20 +32,20 @@ concurrency: jobs: miri: - uses: taiki-e/github-actions/.github/workflows/miri.yml@4b7dd02e8c8bba1591c00f1442fc8cc29953d8f6 # main + uses: taiki-e/github-actions/.github/workflows/miri.yml@2474ed4664eb8903c151603a9d841512c069f7f6 # main with: # NB: sync with test job's --exclude option args: --exclude install-action-internal-codegen msrv: - uses: taiki-e/github-actions/.github/workflows/msrv.yml@4b7dd02e8c8bba1591c00f1442fc8cc29953d8f6 # main + uses: taiki-e/github-actions/.github/workflows/msrv.yml@2474ed4664eb8903c151603a9d841512c069f7f6 # main test-manifest-schema: - uses: taiki-e/github-actions/.github/workflows/test.yml@4b7dd02e8c8bba1591c00f1442fc8cc29953d8f6 # main + uses: taiki-e/github-actions/.github/workflows/test.yml@2474ed4664eb8903c151603a9d841512c069f7f6 # main with: # NB: sync with miri job's --exclude option test-args: --exclude install-action-internal-codegen no-std: false tidy: - uses: taiki-e/github-actions/.github/workflows/tidy.yml@4b7dd02e8c8bba1591c00f1442fc8cc29953d8f6 # main + uses: taiki-e/github-actions/.github/workflows/tidy.yml@2474ed4664eb8903c151603a9d841512c069f7f6 # main permissions: contents: write # for creating branch for pr pull-requests: write # unused (used in `codegen-automerge: true` case) diff --git a/.github/workflows/manifest.yml b/.github/workflows/manifest.yml index 2aca7b08..8b5aa368 100644 --- a/.github/workflows/manifest.yml +++ b/.github/workflows/manifest.yml @@ -32,7 +32,7 @@ concurrency: jobs: manifest: - uses: taiki-e/github-actions/.github/workflows/gen.yml@4b7dd02e8c8bba1591c00f1442fc8cc29953d8f6 # main + uses: taiki-e/github-actions/.github/workflows/gen.yml@2474ed4664eb8903c151603a9d841512c069f7f6 # main permissions: contents: write # for creating branch for pr pull-requests: write # for gh pr review --approve diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6c025a98..e722745b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,7 +34,7 @@ concurrency: jobs: release: if: github.repository_owner == 'taiki-e' && inputs.target == 'install-action' - uses: taiki-e/github-actions/.github/workflows/action-release.yml@4b7dd02e8c8bba1591c00f1442fc8cc29953d8f6 # main + uses: taiki-e/github-actions/.github/workflows/action-release.yml@2474ed4664eb8903c151603a9d841512c069f7f6 # main permissions: contents: write # for taiki-e/create-gh-release-action secrets: @@ -46,7 +46,7 @@ jobs: release-manifest-schema: if: github.repository_owner == 'taiki-e' && inputs.target == 'install-action-manifest-schema' - uses: taiki-e/github-actions/.github/workflows/rust-release.yml@4b7dd02e8c8bba1591c00f1442fc8cc29953d8f6 # main + uses: taiki-e/github-actions/.github/workflows/rust-release.yml@2474ed4664eb8903c151603a9d841512c069f7f6 # main permissions: contents: write # for taiki-e/create-gh-release-action id-token: write # for rust-lang/crates-io-auth-action diff --git a/tools/ci/release-post-commit.sh b/tools/ci/release-post-commit.sh index 6b6420fb..d962ec0c 100755 --- a/tools/ci/release-post-commit.sh +++ b/tools/ci/release-post-commit.sh @@ -36,10 +36,9 @@ for tool in "${tools[@]}"; do git add action.yml git commit -m "${tool}" git tag -f "${tool}" - git checkout refs/tags/"${TAG}" + git checkout main ) - refs+=("+refs/heads/releases/${tool}" "+refs/tags/${tool}") - branches+=("releases/${tool}") + refs+=",+refs/heads/releases/${tool},+refs/tags/${tool}" done set -x @@ -59,6 +58,7 @@ else schema_version="$(cut -d. -f1 <<<"${schema_version}")" fi schema_branch="manifest-schema-${schema_version}" +refs+=",refs/heads/${schema_branch}" if git fetch origin "${schema_branch}"; then git checkout "origin/${schema_branch}" -B "${schema_branch}" @@ -78,5 +78,9 @@ git add . if [[ "$(git status --porcelain=v1 | LC_ALL=C wc -l)" != "0" ]]; then git commit -m 'Update manifest schema' fi +git checkout main -git checkout refs/tags/"${TAG}" +printf 'additional-refs: %s\n' "${refs}" +if [[ -n "${GITHUB_OUTPUT:-}" ]]; then + printf 'additional-refs=%s\n' "${refs}" >>"${GITHUB_OUTPUT}" +fi