more

This reverts commit 80e5c744e1.

.github/actions/checkout/action.yml

@@ -16,7 +16,7 @@ runs:
     shell: bash
     run: |
       cd src/electron
-      node script/yarn install
+      node script/yarn install --frozen-lockfile
   - name: Get Depot Tools
     shell: bash
     run: |

.github/workflows/build.yml

@@ -113,7 +113,7 @@ jobs:
     needs: checkout-macos
     with:
       build-runs-on: macos-14-xlarge
-      test-runs-on: macos-14-xlarge
+      test-runs-on: macos-13
       target-platform: macos
       target-arch: x64
       is-release: false
@@ -127,7 +127,7 @@ jobs:
     needs: checkout-macos
     with:
       build-runs-on: macos-14-xlarge
-      test-runs-on: macos-14-xlarge
+      test-runs-on: macos-14
       target-platform: macos
       target-arch: arm64
       is-release: false

.github/workflows/pipeline-electron-lint.yml

@@ -27,7 +27,7 @@ jobs:
     - name: Install Dependencies
       run: |
         cd src/electron
-        node script/yarn install
+        node script/yarn install --frozen-lockfile
     - name: Setup third_party Depot Tools
       shell: bash
       run: |

.github/workflows/pipeline-segment-electron-build.yml

@@ -89,7 +89,7 @@ jobs:
     - name: Install Dependencies
       run: |
         cd src/electron
-        node script/yarn install
+        node script/yarn install --frozen-lockfile
     - name: Install AZCopy
       if: ${{ inputs.target-platform == 'macos' }}
       run: brew install azcopy

.github/workflows/pipeline-segment-electron-test.yml

@@ -36,7 +36,7 @@ jobs:
       fail-fast: false
       matrix:
         build-type: ${{ inputs.target-platform == 'macos' && fromJSON('["darwin","mas"]') || fromJSON('["linux"]') }}
-        shard: ${{ inputs.target-platform == 'macos' && fromJSON('[1]') || fromJSON('[1, 2, 3]') }}
+        shard: ${{ inputs.target-platform == 'macos' && fromJSON('[1, 2]') || fromJSON('[1, 2, 3]') }}
     env:
       BUILD_TYPE: ${{ matrix.build-type }}
       TARGET_ARCH: ${{ inputs.target-arch }}
@@ -45,6 +45,37 @@ jobs:
       if: ${{ inputs.target-arch == 'arm' }}
       run: |
         cp $(which node) /mnt/runner-externals/node20/bin/
+    - name: Add TCC permissions on macOS
+      if: ${{ inputs.target-platform == 'macos' }}
+      run: |
+        configure_user_tccdb () {
+          local values=$1
+          local dbPath="$HOME/Library/Application Support/com.apple.TCC/TCC.db"
+          local sqlQuery="INSERT OR REPLACE INTO access VALUES($values);"
+          sqlite3 "$dbPath" "$sqlQuery"
+        }
+
+        configure_sys_tccdb () {
+          local values=$1
+          local dbPath="/Library/Application Support/com.apple.TCC/TCC.db"
+          local sqlQuery="INSERT OR REPLACE INTO access VALUES($values);"
+          sudo sqlite3 "$dbPath" "$sqlQuery"
+        }
+
+        userValuesArray=(
+            "'kTCCServiceMicrophone','/usr/local/opt/runner/provisioner/provisioner',1,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1687786159"
+            "'kTCCServiceCamera','/usr/local/opt/runner/provisioner/provisioner',1,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1687786159"
+            "'kTCCServiceBluetoothAlways','/usr/local/opt/runner/provisioner/provisioner',1,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1687786159"
+        )
+        for values in "${userValuesArray[@]}"; do
+          configure_user_tccdb "$values,NULL,NULL,'UNUSED',${values##*,}"
+          configure_sys_tccdb "$values,NULL,NULL,'UNUSED',${values##*,}"
+        done
+    - name: Setup tmate session
+      if: ${{ inputs.target-platform == 'macos' }}
+      uses: mxschmitt/action-tmate@v3
+      with:
+        limit-access-to-actor: true
     - name: Checkout Electron
       uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
       with:
@@ -53,7 +84,7 @@ jobs:
     - name: Install Dependencies
       run: |
         cd src/electron
-        node script/yarn install
+        node script/yarn install --frozen-lockfile
     - name: Get Depot Tools
       timeout-minutes: 5
       run: |
@@ -97,6 +128,7 @@ jobs:
     #     cd src/electron
     #     ./script/codesign/generate-identity.sh
     - name: Run Electron Tests
+      shell: bash
       env:
         MOCHA_REPORTER: mocha-multi-reporters
         ELECTRON_TEST_RESULTS_DIR: junit
@@ -107,11 +139,15 @@ jobs:
       run: |
         cd src/electron
         # Get which tests are on this shard
-        tests_files=$(node script/split-tests ${{ matrix.shard }} ${{ inputs.target-platform == 'macos' && 1 || 3 }})
+        tests_files=$(node script/split-tests ${{ matrix.shard }} ${{ inputs.target-platform == 'macos' && 2 || 3 }})
 
         # Run tests
         if [ "`uname`" = "Darwin" ]; then
+          echo "About to start tests"
           node script/yarn test --runners=main --trace-uncaught --enable-logging
+          TEST_EXIT=$?
+          echo "Done with tests"
+          exit $TEST_EXIT
         else
           chown :builduser .. && chmod g+w ..
           chown -R :builduser . && chmod -R g+w .

.github/workflows/pipeline-segment-node-nan-test.yml

@@ -58,7 +58,7 @@ jobs:
     - name: Install Dependencies
       run: |
         cd src/electron
-        node script/yarn install
+        node script/yarn install --frozen-lockfile
     - name: Get Depot Tools
       timeout-minutes: 5
       run: |
@@ -123,7 +123,7 @@ jobs:
     - name: Install Dependencies
       run: |
         cd src/electron
-        node script/yarn install
+        node script/yarn install --frozen-lockfile
     - name: Get Depot Tools
       timeout-minutes: 5
       run: |

script/actions/move-artifacts.sh

@@ -51,7 +51,6 @@ move_src_dirs_if_exist() {
     src/out/Default/overlapped-checker \
     src/out/Default/ffmpeg \
     src/out/Default/hunspell_dictionaries \
-    src/electron \
     src/third_party/electron_node \
     src/third_party/nan \
     src/cross-arch-snapshots \