fix: switch to mas config

electron · Mar 7, 2024 · cb506bd · cb506bd
1 parent ecf7c52
commit cb506bd
Showing 1 changed file with 36 additions and 11 deletions.
diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml
@@ -145,7 +145,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        build-type: [darwin, mas]
+        build-type: [mas]
     env:
       BUILD_TYPE: ${{ matrix.build-type }}
     steps:
@@ -308,24 +308,49 @@ jobs:
         echo 'RBE_service='`node -e "console.log(require('./src/utils/reclient.js').serviceAddress)"` >> $GITHUB_ENV
         echo 'RBE_experimental_credentials_helper='`node -e "console.log(require('./src/utils/reclient.js').helperPath({}))"` >> $GITHUB_ENV
         echo 'RBE_experimental_credentials_helper_args=print' >> $GITHUB_ENV
-    - name: Default GN gen
+    - name: Create MAS Config
+      if: ${{ matrix.build-type }} == 'mas'
+      run: |
+        echo "
+            {
+                \"root\": \"/Users/runner/work/electron/electron/\",
+                \"remotes\": {
+                    \"electron\": {
+                        \"origin\": \"https://github.com/electron/electron.git\"
+                    }
+                },
+                \"gen\": {
+                    \"args\": [
+                        \"import(\\\"//electron/build/args/testing.gn\\\")\",
+                        \"use_remoteexec = true\",
+                        \"target_cpu = \\\"arm64\\\"\",
+                        \"is_mas_build = true\"
+                    ],
+                    \"out\": \"Testing\"
+                },
+                \"env\": {
+                    \"CHROMIUM_BUILDTOOLS_PATH\": \"/Users/runner/work/electron/electron/src/buildtools\",
+                    \"GIT_CACHE_PATH\": \"/Users/runner/work/electron/electron/.git-cache\"
+                },
+                \"\$schema\": \"file:///home/builduser/.electron_build_tools/evm-config.schema.json\",
+                \"configValidationLevel\": \"strict\",
+                \"reclient\": \"remote_exec\",
+                \"goma\": \"none\",
+                \"preserveXcode\": 5
+            }
+        " >$HOME/.electron_build_tools/configs/evm.mas.json
+
+        echo "MAS_BUILD=true" >> $GITHUB_ENV
+        e use mas
+    - name: Build Electron
       run: |
         cd src/electron
         # TODO(codebytere): remove this once we figure out why .git/packed-refs is initially missing
         git pack-refs
         cd ..
 
-        if [[ "${{ matrix.build-type }}" == "darwin" ]]; then
-          gn gen out/Default --args="import(\"$GN_CONFIG\") use_remoteexec=true target_cpu = \"arm64\" ${GN_BUILDFLAG_ARGS}"
-        else
-          gn gen out/Default --args="import(\"$GN_CONFIG\") use_remoteexec=true is_mas_build = true target_cpu = \"arm64\" ${GN_BUILDFLAG_ARGS}"
-          echo "MAS_BUILD=true" >> $GITHUB_ENV
-        fi
-    - name: Build Electron
-      run: |
         ulimit -n 10000
         sudo launchctl limit maxfiles 65536 200000
-        cd src
         NINJA_SUMMARIZE_BUILD=1 e build -j $NUMBER_OF_NINJA_PROCESSES
         cp out/Default/.ninja_log out/electron_ninja_log
         node electron/script/check-symlinks.js