From c34385eb01cb83297323ac22b4192a8f6fdcd1e5 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Thu, 10 Dec 2020 11:52:22 +0200
Subject: CI: add a 30-min timeout for BrowserStack (#32238)

---
 .github/workflows/browserstack.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to '.github/workflows/browserstack.yml')

diff --git a/.github/workflows/browserstack.yml b/.github/workflows/browserstack.yml
index 0b4cfbdaa..00831721d 100644
--- a/.github/workflows/browserstack.yml
+++ b/.github/workflows/browserstack.yml
@@ -12,6 +12,7 @@ jobs:
   browserstack:
     runs-on: ubuntu-latest
     if: github.repository == 'twbs/bootstrap' && (!contains(github.event.commits[0].message, '[ci skip]') && !contains(github.event.commits[0].message, '[skip ci]'))
+    timeout-minutes: 30
 
     steps:
       - name: Clone repository
-- 
cgit v1.2.3


From 97a3ef357d0a4f291663f6bcc5333ce8a24a9e74 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Tue, 5 Jan 2021 21:56:31 +0200
Subject: CI: update to actions/setup-node@v2 (#32635)

---
 .github/workflows/browserstack.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.github/workflows/browserstack.yml')

diff --git a/.github/workflows/browserstack.yml b/.github/workflows/browserstack.yml
index 00831721d..917ccc188 100644
--- a/.github/workflows/browserstack.yml
+++ b/.github/workflows/browserstack.yml
@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Set up Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
           node-version: "${{ env.NODE }}"
 
-- 
cgit v1.2.3


From 0bcaa068f2e376fb5e525ab12598b00dd66a0dae Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Mon, 11 Jan 2021 13:05:05 +0200
Subject: GitHub Actions cleanup (#32755)

* lowercase `runner.os`
* remove `CI` environment variable since it's already set by the runner
---
 .github/workflows/browserstack.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to '.github/workflows/browserstack.yml')

diff --git a/.github/workflows/browserstack.yml b/.github/workflows/browserstack.yml
index 917ccc188..ea0a25704 100644
--- a/.github/workflows/browserstack.yml
+++ b/.github/workflows/browserstack.yml
@@ -4,7 +4,6 @@ on:
   push:
 
 env:
-  CI: true
   FORCE_COLOR: 2
   NODE: 14.x
 
@@ -29,8 +28,8 @@ jobs:
           path: ~/.npm
           key: ${{ runner.os }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
           restore-keys: |
-            ${{ runner.OS }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
-            ${{ runner.OS }}-node-v${{ env.NODE }}-
+            ${{ runner.os }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
+            ${{ runner.os }}-node-v${{ env.NODE }}-
 
       - name: Install npm dependencies
         run: npm ci
-- 
cgit v1.2.3


From 8c1444f00a44552dcc7d786df15b65aeeaf7c945 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Thu, 14 Jan 2021 12:51:14 +0200
Subject: CI: change Node.js to `14` (#32796)

This is so that it's consistent with the JS workflow thus the cache should match.
---
 .github/workflows/browserstack.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.github/workflows/browserstack.yml')

diff --git a/.github/workflows/browserstack.yml b/.github/workflows/browserstack.yml
index ea0a25704..a12bffcf7 100644
--- a/.github/workflows/browserstack.yml
+++ b/.github/workflows/browserstack.yml
@@ -5,7 +5,7 @@ on:
 
 env:
   FORCE_COLOR: 2
-  NODE: 14.x
+  NODE: 14
 
 jobs:
   browserstack:
-- 
cgit v1.2.3


From c93d754d35eadf6cb81a8fccef9ce091ea4f28c9 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Mon, 8 Feb 2021 21:41:10 +0200
Subject: CI: remove the cache fallback and shorten cache key (#33012)

---
 .github/workflows/browserstack.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to '.github/workflows/browserstack.yml')

diff --git a/.github/workflows/browserstack.yml b/.github/workflows/browserstack.yml
index a12bffcf7..bdbc16089 100644
--- a/.github/workflows/browserstack.yml
+++ b/.github/workflows/browserstack.yml
@@ -26,10 +26,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ~/.npm
-          key: ${{ runner.os }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
+          key: ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
           restore-keys: |
-            ${{ runner.os }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
-            ${{ runner.os }}-node-v${{ env.NODE }}-
+            ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
 
       - name: Install npm dependencies
         run: npm ci
-- 
cgit v1.2.3