ci: filter release commit only for bump check

Wroud · Sep 9, 2024 · cef7894 · cef7894
1 parent bdabf2e
commit cef7894
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -54,8 +54,7 @@ jobs:
       - name: Run ci:prepublish
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITHUB_REPOSITORY_OWNER: ${{ github.repository_owner }}
-          GITHUB_REPOSITORY_NAME: ${{ github.repository }}
+          GITHUB_REPOSITORY: ${{ github.repository }}
         run: yarn workspaces foreach -A --no-private run ci:prepublish
 
       - name: Release

diff --git a/packages/ci/src/gulp/prepublish.ts b/packages/ci/src/gulp/prepublish.ts
@@ -11,21 +11,22 @@ import { pipeline } from "stream/promises";
 import { combineStreams } from "./combineStreams.js";
 import { createReadStream, createWriteStream, existsSync } from "fs";
 import { githubRelease } from "@wroud/ci-github-release";
+import { releaseCommitRegex } from "./releaseCommitRegex.js";
 
 const tagPrefix = "di-v";
 const commitPath = ".";
 const changeLogFile = "CHANGELOG.md";
 // print output of commands into the terminal
 const stdio = "inherit";
-const commitsConfig = { path: commitPath, ignore: /^chore: release/ };
+const commitsConfig = { path: commitPath /*, ignore: releaseCommitRegex*/ };
 
 async function bumpVersion(preset: Preset): Promise<string | null> {
   const bumper = new RestrictEmptyCommits(process.cwd())
     .loadPreset(preset)
     .tag({
       prefix: tagPrefix,
     })
-    .commits(commitsConfig);
+    .commits({ ...commitsConfig, ignore: releaseCommitRegex });
 
   const recommendation = await bumper.bump();
 
@@ -81,8 +82,8 @@ async function commitTagPush(version: string) {
 
 async function publishGithubRelease(preset: Preset) {
   const token = process.env["GITHUB_TOKEN"];
-  const owner = process.env["GITHUB_REPOSITORY_OWNER"];
-  const repository = process.env["GITHUB_REPOSITORY_NAME"];
+  const [owner, repository] =
+    process.env["GITHUB_REPOSITORY"]?.split("/") || [];
 
   if (!token) {
     throw new Error("Expected GITHUB_TOKEN environment variable");

diff --git a/packages/ci/src/gulp/releaseCommitRegex.ts b/packages/ci/src/gulp/releaseCommitRegex.ts
@@ -0,0 +1 @@
+export const releaseCommitRegex = /^chore: release/;
diff --git a/packages/di/README.md b/packages/di/README.md
@@ -3,7 +3,7 @@
 [![ESM-only package][package]][package-url]
 [![NPM version][npm]][npm-url]
 
-<!-- [![Install size][size]][size-url] -->
+<!-- [![Install size][size]][size-url] test -->
 
 [package]: https://img.shields.io/badge/package-ESM--only-ffe536.svg
 [package-url]: https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export const releaseCommitRegex = /^chore: release/;