From cef7894b572455262f26c0e2e3981bcde07c3018 Mon Sep 17 00:00:00 2001
From: Aleksei Potsetsuev <wrouds@gmail.com>
Date: Mon, 9 Sep 2024 20:22:04 +0800
Subject: [PATCH] ci: filter release commit only for bump check

---
 .github/workflows/release.yml              | 3 +--
 packages/ci/src/gulp/prepublish.ts         | 9 +++++----
 packages/ci/src/gulp/releaseCommitRegex.ts | 1 +
 packages/di/README.md                      | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 packages/ci/src/gulp/releaseCommitRegex.ts

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b2e0dcd..eb85381 100644
--- 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
index d3385eb..d57083c 100644
--- a/packages/ci/src/gulp/prepublish.ts
+++ b/packages/ci/src/gulp/prepublish.ts
@@ -11,13 +11,14 @@ 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())
@@ -25,7 +26,7 @@ async function bumpVersion(preset: Preset): Promise<string | null> {
     .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
new file mode 100644
index 0000000..6a0e5ea
--- /dev/null
+++ 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
index 42a7882..7a0e397 100644
--- 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