From a7e64b5a4f1b78c2a843c22ddb9bd427b45557cf Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Mon, 30 Aug 2021 16:30:51 +0300
Subject: [PATCH] Add GitHub SHA in BrowserStack build ID. (#34077)

---
 .github/workflows/browserstack.yml | 1 +
 js/tests/karma.conf.js             | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/browserstack.yml b/.github/workflows/browserstack.yml
index ffa594a774..f689a6f352 100644
--- a/.github/workflows/browserstack.yml
+++ b/.github/workflows/browserstack.yml
@@ -34,3 +34,4 @@ jobs:
         env:
           BROWSER_STACK_ACCESS_KEY: "${{ secrets.BROWSER_STACK_ACCESS_KEY }}"
           BROWSER_STACK_USERNAME: "${{ secrets.BROWSER_STACK_USERNAME }}"
+          GITHUB_SHA: "${{ github.sha }}"
diff --git a/js/tests/karma.conf.js b/js/tests/karma.conf.js
index 67b60f15ee..1d4b0d3e4d 100644
--- a/js/tests/karma.conf.js
+++ b/js/tests/karma.conf.js
@@ -108,7 +108,7 @@ if (BROWSERSTACK) {
   conf.browserStack = {
     username: ENV.BROWSER_STACK_USERNAME,
     accessKey: ENV.BROWSER_STACK_ACCESS_KEY,
-    build: `bootstrap-${new Date().toISOString()}`,
+    build: `bootstrap-${ENV.GITHUB_SHA ? ENV.GITHUB_SHA.slice(0, 7) + '-' : ''}${new Date().toISOString()}`,
     project: 'Bootstrap',
     retryLimit: 2
   }