From 94b2046efd9859ada189663a3cfd7b3f235d9ad8 Mon Sep 17 00:00:00 2001
From: badeggg <zhaoxuxujc@gmail.com>
Date: Tue, 14 May 2024 15:22:08 +0800
Subject: [PATCH 1/2] fix: 41936, do not skip workflow on main branch

---
 .github/workflows/lint.yml | 2 +-
 .github/workflows/test.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 50e886942c98..da7757fcbfa8 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -8,7 +8,7 @@ on:
     paths: ['**.js', '**.ts', '**.tsx', '**.json', '**.mjs', '**.cjs', 'config/.editorconfig', '.watchmanconfig', '.imgbotconfig']
 
 concurrency:
-  group: "${{ github.ref }}-lint"
+  group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-lint
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c76425a40fbf..d6b346cb3995 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ on:
     paths: ['**.js', '**.ts', '**.tsx', '**.sh', 'package.json', 'package-lock.json']
 
 concurrency:
-  group: "${{ github.ref }}-jest"
+  group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-jest
   cancel-in-progress: true
 
 jobs:

From 54a22fa9365cf7677ab3320345ae44779c33f64a Mon Sep 17 00:00:00 2001
From: badeggg <zhaoxuxujc@gmail.com>
Date: Wed, 15 May 2024 06:15:03 +0800
Subject: [PATCH 2/2] add concurrency config to typecheck.yml and
 e2ePerformanceTests.yml

---
 .github/workflows/e2ePerformanceTests.yml | 4 ++++
 .github/workflows/typecheck.yml           | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/.github/workflows/e2ePerformanceTests.yml b/.github/workflows/e2ePerformanceTests.yml
index 10723d5efa04..7e7d55ac5d2e 100644
--- a/.github/workflows/e2ePerformanceTests.yml
+++ b/.github/workflows/e2ePerformanceTests.yml
@@ -15,6 +15,10 @@ on:
         type: string
         required: true
 
+concurrency:
+  group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-e2e
+  cancel-in-progress: true
+
 jobs:
   buildBaseline:
     runs-on: ubuntu-latest-xl
diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml
index 88d4d24a5723..476b01f87b07 100644
--- a/.github/workflows/typecheck.yml
+++ b/.github/workflows/typecheck.yml
@@ -7,6 +7,10 @@ on:
     branches-ignore: [staging, production]
     paths: ['**.js', '**.ts', '**.tsx', 'package.json', 'package-lock.json', 'tsconfig.json']
 
+concurrency:
+  group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-typecheck
+  cancel-in-progress: true
+
 jobs:
   typecheck:
     if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}