repokeeper 0.4.2 → 0.4.4

package/README.md

@@ -78,7 +78,11 @@ work:
   pull requests.
 - Optionally add a `RELEASE_PLEASE_TOKEN` secret (a fine-grained token with contents, pull requests
   and issues write access). Without it the release pull request is opened with `GITHUB_TOKEN`, and
-  GitHub does not run CI on pull requests opened that way.
+  GitHub holds its `pull_request` runs until someone approves them; the `release-pr-ci` job approves
+  them, so the pull request gets its checks and required checks in a ruleset can pass.
+
+A repository with no release yet (manifest at `0.0.0`) gets `initial-version: 0.1.0`, so its first
+release is 0.1.0 rather than release-please's default 1.0.0.
 
 Set `modules.drift: true` to add a `repokeeper` job to `ci.yml` that runs `repokeeper check` with
 the version that wrote the standard, so a pull request that edits a managed file fails until the edit

package/dist/platforms/github.js

@@ -22,6 +22,15 @@ const workflowKey = (module, path, keyPath, value) => ({
     value,
     order: WORKFLOW_KEYS,
 });
+/** Waits briefly for the held runs to appear, since GitHub creates them just after the pull request event. */
+const APPROVE_RELEASE_PR_RUNS = `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
+`;
 const RELEASE_PLEASE_SCHEMA = "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json";
 const json = (value) => `${JSON.stringify(value, null, 2)}\n`;
 export const githubPlatform = {
@@ -146,6 +155,7 @@ export const githubPlatform = {
     },
     releaseAutomation(ctx, release) {
         const path = ".github/workflows/release.yml";
+        const seed = release.version ?? ctx.repo.releasedVersion ?? "0.0.0";
         return [
             {
                 kind: "file",
@@ -161,6 +171,10 @@ export const githubPlatform = {
                             "include-component-in-tag": false,
                             ...(release.extraFiles && release.extraFiles.length > 0 ? { "extra-files": release.extraFiles } : {}),
                             ...(release.versionFile ? { "version-file": release.versionFile } : {}),
+                            // Without it a pom at a release version first gets a pull request that only bumps to -SNAPSHOT
+                            ...(release.type === "maven" ? { "skip-snapshot": true } : {}),
+                            // release-please makes a repository's first release 1.0.0 unless told otherwise
+                            ...(seed === "0.0.0" ? { "initial-version": "0.1.0" } : {}),
                         },
                     },
                 }),
@@ -169,7 +183,7 @@ export const githubPlatform = {
                 kind: "seed",
                 module: "release",
                 path: ".release-please-manifest.json",
-                content: json({ ".": release.version ?? ctx.repo.releasedVersion ?? "0.0.0" }),
+                content: json({ ".": seed }),
             },
             workflowKey("release", path, ["name"], "release"),
             workflowKey("release", path, ["on"], { push: { branches: [defaultBranch(ctx.config)] } }),
@@ -180,6 +194,26 @@ export const githubPlatform = {
                 // biome-ignore lint/suspicious/noTemplateCurlyInString: a GitHub Actions expression, not a JS template
                 secrets: { token: "${{ secrets.RELEASE_PLEASE_TOKEN }}" },
             }),
+            // GitHub holds the pull_request runs of a pull request that GITHUB_TOKEN opened until someone
+            // approves them, so required checks never report; approve them for the release pull request
+            workflowKey("release", path, ["jobs", "release-pr-ci"], {
+                needs: "release",
+                // biome-ignore lint/suspicious/noTemplateCurlyInString: a GitHub Actions expression, not a JS template
+                if: "${{ needs.release.outputs.pr_branch != '' }}",
+                "runs-on": "ubuntu-latest",
+                permissions: { actions: "write" },
+                steps: [
+                    {
+                        env: {
+                            // biome-ignore lint/suspicious/noTemplateCurlyInString: a GitHub Actions expression, not a JS template
+                            GH_TOKEN: "${{ github.token }}",
+                            // biome-ignore lint/suspicious/noTemplateCurlyInString: a GitHub Actions expression, not a JS template
+                            BRANCH: "${{ needs.release.outputs.pr_branch }}",
+                        },
+                        run: APPROVE_RELEASE_PR_RUNS,
+                    },
+                ],
+            }),
         ];
     },
 };

package/dist/version.js

@@ -1,7 +1,7 @@
 import { readFileSync } from "node:fs";
 export const PACKAGE_VERSION = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8")).version;
 /** The standard this build of repokeeper applies. Bump it whenever generated output changes. */
-export const STANDARD_VERSION = "1.3.1";
+export const STANDARD_VERSION = "1.4.0";
 export const TOOL_VERSIONS = {
     lefthook: "2.1.14",
     commitlintCli: "21.2.3",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "repokeeper",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "Keep every repository on one maintained standard: commits, git hooks, CI, releases, dependency updates and repo settings.",
   "type": "module",
   "bin": {