github-issue-tower-defence-management 1.152.0 → 1.152.2

package/.github/workflows/api-created_issue_pr.yml

@@ -18,7 +18,7 @@ env:
 
 jobs:
   add-to-project:
-    runs-on: ${{ github.event.repository.private && 'blacksmith-2vcpu-ubuntu-2204' || 'ubuntu-latest' }}
+    runs-on: ubuntu-latest
     steps:
       - uses: step-security/harden-runner@v2
         with:

package/.github/workflows/ci-failure-issue-creator.yml

@@ -13,7 +13,7 @@ on:
 jobs:
   create-or-comment-issue:
     if: github.event.check_suite.conclusion == 'failure' && github.event.check_suite.head_branch == github.event.repository.default_branch
-    runs-on: ${{ github.event.repository.private && 'blacksmith-2vcpu-ubuntu-2204' || 'ubuntu-latest' }}
+    runs-on: ubuntu-latest
     permissions:
       issues: write
     steps:

package/.github/workflows/close-manual-prs.yml

@@ -16,7 +16,7 @@ on:
 
 jobs:
   close-manual-pr:
-    runs-on: ${{ github.event.repository.private && 'blacksmith-2vcpu-ubuntu-2204' || 'ubuntu-latest' }}
+    runs-on: ubuntu-latest
     if: github.event_name != 'pull_request' || github.event.pull_request.user.type != 'Bot'
     steps:
       - uses: step-security/harden-runner@v2

package/.github/workflows/commit-lint.yml

@@ -18,7 +18,7 @@ concurrency:
 
 jobs:
   commit-lint:
-    runs-on: ${{ github.event.repository.private && 'blacksmith-2vcpu-ubuntu-2204' || 'ubuntu-latest' }}
+    runs-on: ubuntu-latest
     permissions:
       issues: read
       pull-requests: write

package/.github/workflows/console-ui.yml

@@ -7,7 +7,7 @@ permissions:
   contents: read
 
 concurrency:
-  group: console-ui-${{ github.ref }}
+  group: console-ui-${{ github.ref == 'refs/heads/main' && github.sha || github.ref }}
   cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:

package/.github/workflows/create-pr.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   create_and_enable_automerge:
-    runs-on: ${{ github.event.repository.private && 'blacksmith-2vcpu-ubuntu-2204' || 'ubuntu-latest' }}
+    runs-on: ubuntu-latest
     if: github.ref_name != github.event.repository.default_branch
     steps:
       - uses: step-security/harden-runner@v2

package/.github/workflows/secret-scan.yml

@@ -19,7 +19,7 @@ concurrency:
 
 jobs:
   secret-scan:
-    runs-on: ${{ github.event.repository.private && 'blacksmith-2vcpu-ubuntu-2204' || 'ubuntu-latest' }}
+    runs-on: ubuntu-latest
     permissions:
       contents: read
       pull-requests: read

package/.github/workflows/test.yml

@@ -4,7 +4,7 @@ on:
   push:
 
 concurrency:
-  group: test-${{ github.ref }}
+  group: test-${{ github.ref == 'refs/heads/main' && github.sha || github.ref }}
   cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:

package/.github/workflows/umino-project.yml

@@ -57,7 +57,7 @@ jobs:
          contains(github.event.comment.body, '/movenextactiondateto') ||
          contains(github.event.comment.body, '/changeassignee ')))) &&
       github.event.action != 'labeled'
-    runs-on: ${{ github.event.repository.private && 'blacksmith-2vcpu-ubuntu-2204' || 'ubuntu-latest' }}
+    runs-on: ubuntu-latest
     steps:
       - uses: step-security/harden-runner@v2
         with:
@@ -281,7 +281,7 @@ jobs:
           repo-token: ${{ steps.app-token.outputs.token }}
 
   check_pull_requests_to_link_issues:
-    runs-on: ${{ github.event.repository.private && 'blacksmith-2vcpu-ubuntu-2204' || 'ubuntu-latest' }}
+    runs-on: ubuntu-latest
     name: Check linked issues in pull requests
     if: >-
       github.repository != 'HiromiShikata/test-repository' &&

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.152.2](https://github.com/HiromiShikata/npm-cli-github-issue-tower-defence-management/compare/v1.152.1...v1.152.2) (2026-08-14)
+
+
+### Bug Fixes
+
+* **deps:** update package-lock.json to resolve js-yaml vulnerability ([#1550](https://github.com/HiromiShikata/npm-cli-github-issue-tower-defence-management/issues/1550)) ([b49fb5f](https://github.com/HiromiShikata/npm-cli-github-issue-tower-defence-management/commit/b49fb5f97a40b6ed47865307b318278c317796c8)), closes [hi#severity](https://github.com/hi/issues/severity) [#1549](https://github.com/HiromiShikata/npm-cli-github-issue-tower-defence-management/issues/1549)
+
+## [1.152.1](https://github.com/HiromiShikata/npm-cli-github-issue-tower-defence-management/compare/v1.152.0...v1.152.1) (2026-08-14)
+
+
+### Bug Fixes
+
+* **ci:** key concurrency group on sha for default branch to prevent queued run cancellation ([#1547](https://github.com/HiromiShikata/npm-cli-github-issue-tower-defence-management/issues/1547)) ([b8dc4d0](https://github.com/HiromiShikata/npm-cli-github-issue-tower-defence-management/commit/b8dc4d0bdcb2a07b6568a57acfaa048f518278f8)), closes [#1515](https://github.com/HiromiShikata/npm-cli-github-issue-tower-defence-management/issues/1515)
+
 # [1.152.0](https://github.com/HiromiShikata/npm-cli-github-issue-tower-defence-management/compare/v1.151.7...v1.152.0) (2026-08-14)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "github-issue-tower-defence-management",
-  "version": "1.152.0",
+  "version": "1.152.2",
   "description": "",
   "main": "bin/index.js",
   "scripts": {

package/src/adapter/ci/workflowRunCancellation.test.ts

@@ -43,19 +43,49 @@ const pushesCommitsToTheRepository = (fileName: string): boolean => {
   );
 };
 
+const concurrencyGroupForPush = (
+  workflowPrefix: string,
+  ref: string,
+  sha: string,
+): string => `${workflowPrefix}-${ref === defaultBranchRef ? sha : ref}`;
+
+const concurrencyGroupExpression = (workflowPrefix: string): string =>
+  `${workflowPrefix}-\${{ github.ref == '${defaultBranchRef}' && github.sha || github.ref }}`;
+
 const guardedWorkflows = [
-  { fileName: 'test.yml', concurrencyGroup: `test-\${{ github.ref }}` },
-  {
-    fileName: 'console-ui.yml',
-    concurrencyGroup: `console-ui-\${{ github.ref }}`,
-  },
+  { fileName: 'test.yml', workflowPrefix: 'test' },
+  { fileName: 'console-ui.yml', workflowPrefix: 'console-ui' },
 ];
 
 describe('push-triggered workflow run cancellation', () => {
+  describe('concurrency group behavior', () => {
+    it('gives each default-branch commit its own group so queued runs survive incoming commits', () => {
+      expect(
+        concurrencyGroupForPush('test', defaultBranchRef, 'abc123'),
+      ).not.toBe(concurrencyGroupForPush('test', defaultBranchRef, 'def456'));
+    });
+
+    it('gives all pushes of the same feature branch the same group so superseded runs are cancelled', () => {
+      const featureBranchRef = 'refs/heads/feature/my-feature';
+      expect(concurrencyGroupForPush('test', featureBranchRef, 'abc123')).toBe(
+        concurrencyGroupForPush('test', featureBranchRef, 'def456'),
+      );
+    });
+
+    it('keeps groups distinct across workflows so unrelated workflows never cancel each other', () => {
+      const groups = guardedWorkflows.map(({ workflowPrefix }) =>
+        concurrencyGroupForPush(workflowPrefix, defaultBranchRef, 'abc123'),
+      );
+      expect(new Set(groups).size).toBe(groups.length);
+    });
+  });
+
   it.each(guardedWorkflows)(
-    'keys the concurrency group of $fileName on the workflow and the pushed ref',
-    ({ fileName, concurrencyGroup }) => {
-      expect(readWorkflowConcurrency(fileName)['group']).toBe(concurrencyGroup);
+    'keys the concurrency group of $fileName on the commit sha for default branch or the ref for other branches',
+    ({ fileName, workflowPrefix }) => {
+      expect(readWorkflowConcurrency(fileName)['group']).toBe(
+        concurrencyGroupExpression(workflowPrefix),
+      );
     },
   );
 
@@ -78,8 +108,10 @@ describe('push-triggered workflow run cancellation', () => {
   it.each(workflowFileNames().filter(pushesCommitsToTheRepository))(
     'never cancels a run of %s, which pushes commits to the repository',
     (fileName) => {
-      expect([undefined, false]).toContain(
-        readWorkflowConcurrency(fileName)['cancel-in-progress'],
+      const cancelInProgress =
+        readWorkflowConcurrency(fileName)['cancel-in-progress'];
+      expect(cancelInProgress === undefined || cancelInProgress === false).toBe(
+        true,
       );
     },
   );