From fa95c59b4b871715f00f832c9817a21f3a888a24 Mon Sep 17 00:00:00 2001
From: Ingo Fischer <github@fischer-ka.de>
Date: Mon, 6 Nov 2023 11:51:23 +0100
Subject: [PATCH] take out macos tests till upstream fixes come in (#487)

* Add node-gyp as dep and adjust actions

* take out macos build until new versions of noble and bleno are released that pin node-gyp

* make test reliable again
---
 .github/actions/prepare-env/action.yml          | 7 -------
 .github/workflows/build-test.js.yml             | 4 +++-
 packages/matter-node.js/test/IntegrationTest.ts | 2 +-
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/.github/actions/prepare-env/action.yml b/.github/actions/prepare-env/action.yml
index fddf2e7c76..b25116e4cd 100644
--- a/.github/actions/prepare-env/action.yml
+++ b/.github/actions/prepare-env/action.yml
@@ -19,13 +19,6 @@ runs:
       with:
         node-version: ${{ inputs.node-version }}
 
-    - name: patch node gyp on windows to support Visual Studio 2019
-      if: ${{ inputs.os == 'windows-latest' || inputs.os == 'windows-2019' }}
-      shell: powershell
-      run: |
-        npm install --global node-gyp@latest
-        npm prefix -g | % {npm config set node_gyp "$_\node_modules\node-gyp\bin\node-gyp.js"}
-
     - name: Install dependencies (Non-Windows)
       if: ${{ inputs.os != 'windows-latest' && inputs.os != 'windows-2019' }}
       shell: bash
diff --git a/.github/workflows/build-test.js.yml b/.github/workflows/build-test.js.yml
index e6399d9c99..e68aecd583 100644
--- a/.github/workflows/build-test.js.yml
+++ b/.github/workflows/build-test.js.yml
@@ -27,6 +27,7 @@ jobs:
           src:
             - "package.json"
             - "packages/**/package.json"
+            - ".github/workflows/build-test.js.yml"
     - name: Prepare testing environment
       uses: ./.github/actions/prepare-env
     - run: npm run format-verify
@@ -38,7 +39,8 @@ jobs:
     strategy:
       matrix:
         node-version: [ 16.x, 18.x, 20.x ]
-        os: [ macos-latest, windows-2019 ]
+        # os: [ macos-latest, windows-2019 ]
+        os: [ windows-2019 ]
     steps:
       - uses: actions/checkout@v4
         if: ${{ needs.check-and-lint.outputs.package-changes == 'true' }}
diff --git a/packages/matter-node.js/test/IntegrationTest.ts b/packages/matter-node.js/test/IntegrationTest.ts
index cd46a413d7..a5358607f1 100644
--- a/packages/matter-node.js/test/IntegrationTest.ts
+++ b/packages/matter-node.js/test/IntegrationTest.ts
@@ -1445,7 +1445,7 @@ describe("Integration Test", () => {
 
             assert.equal(commissioningChangedCallsServer.length, 2);
             assert.ok(sessionChangedCallsServer.length >= 7);
-            assert.equal(sessionChangedCallsServer[7].fabricIndex, FabricIndex(2));
+            assert.equal(sessionChangedCallsServer[sessionChangedCallsServer.length - 1].fabricIndex, FabricIndex(2));
             const sessionInfo = commissioningServer.getActiveSessionInformation();
             assert.equal(sessionInfo.length, 2);
             assert.ok(sessionInfo[1].fabric);