diff --git a/.github/actions/build-electron/action.yml b/.github/actions/build-electron/action.yml index 38e514a553..83b565576e 100644 --- a/.github/actions/build-electron/action.yml +++ b/.github/actions/build-electron/action.yml @@ -79,7 +79,7 @@ runs: shell: bash run: | cd src - e build --target electron:electron_mksnapshot + e build --target electron:electron_mksnapshot_zip ELECTRON_DEPOT_TOOLS_DISABLE_LOG=1 e d gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args # Remove unused args from mksnapshot_args SEDOPTION="-i" @@ -89,7 +89,6 @@ runs: sed $SEDOPTION '/.*builtins-pgo/d' out/Default/mksnapshot_args sed $SEDOPTION '/--turbo-profiling-input/d' out/Default/mksnapshot_args - e build --target electron:electron_mksnapshot_zip if [ "${{ inputs.target-platform }}" = "win" ]; then cd out/Default powershell Compress-Archive -update mksnapshot_args mksnapshot.zip @@ -123,7 +122,6 @@ runs: shell: bash run: | cd src - e build --target electron:electron_chromedriver e build --target electron:electron_chromedriver_zip if [ "${{ inputs.is-asan }}" != "true" ]; then diff --git a/.github/actions/install-build-tools/action.yml b/.github/actions/install-build-tools/action.yml index 9156c09384..868cdc63a4 100644 --- a/.github/actions/install-build-tools/action.yml +++ b/.github/actions/install-build-tools/action.yml @@ -15,7 +15,7 @@ runs: git config --global core.preloadindex true git config --global core.longpaths true fi - export BUILD_TOOLS_SHA=c13f4bdb50e65da46a4703f8f882079dd21fd99e + export BUILD_TOOLS_SHA=706147b2376f55078f718576b28129a0457f1795 npm i -g @electron/build-tools # Update depot_tools to ensure python e d update_depot_tools diff --git a/.github/workflows/pipeline-segment-electron-test.yml b/.github/workflows/pipeline-segment-electron-test.yml index b47cdf3328..7fc818891d 100644 --- a/.github/workflows/pipeline-segment-electron-test.yml +++ b/.github/workflows/pipeline-segment-electron-test.yml @@ -177,22 +177,18 @@ jobs: path: ./src_artifacts_${{ matrix.build-type }}_${{ inputs.target-arch }} - name: Restore Generated Artifacts run: ./src/electron/script/actions/restore-artifacts.sh - - name: Unzip Dist, Mksnapshot & Chromedriver (win) + - name: Unzip Dist (win) if: ${{ inputs.target-platform == 'win' }} shell: powershell run: | Set-ExecutionPolicy Bypass -Scope Process -Force cd src/out/Default Expand-Archive -Force dist.zip -DestinationPath ./ - Expand-Archive -Force chromedriver.zip -DestinationPath ./ - Expand-Archive -Force mksnapshot.zip -DestinationPath ./ - - name: Unzip Dist, Mksnapshot & Chromedriver (unix) + - name: Unzip Dist (unix) if: ${{ inputs.target-platform != 'win' }} run: | cd src/out/Default unzip -:o dist.zip - unzip -:o chromedriver.zip - unzip -:o mksnapshot.zip #- name: Import & Trust Self-Signed Codesigning Cert on MacOS # if: ${{ inputs.target-platform == 'macos' && inputs.target-arch == 'x64' }} # run: |