Revert "shard tests to try to narrow down WOA lockup"

This reverts commit a180658376.
This commit is contained in:
John Kleinschmidt
2024-11-07 20:29:14 -05:00
parent ab49e23003
commit 3423f66520

View File

@@ -50,7 +50,7 @@ jobs:
fail-fast: false
matrix:
build-type: ${{ inputs.target-platform == 'macos' && fromJSON('["darwin","mas"]') || (inputs.target-platform == 'windows' && fromJSON('["windows"]') || fromJSON('["linux"]')) }}
shard: ${{ inputs.target-platform != 'macos' && fromJSON('[1, 2, 3, 4]') || fromJSON('[1, 2]') }}
shard: ${{ inputs.target-platform == 'linux' && fromJSON('[1, 2, 3]') || fromJSON('[1, 2]') }}
env:
BUILD_TYPE: ${{ matrix.build-type }}
TARGET_ARCH: ${{ inputs.target-arch }}
@@ -191,7 +191,7 @@ jobs:
cd src/electron
export ELECTRON_TEST_RESULTS_DIR=`pwd`/junit
# Get which tests are on this shard
tests_files=$(node script/split-tests ${{ matrix.shard }} ${{ inputs.target-platform == 'macos' && 2 || 4 }})
tests_files=$(node script/split-tests ${{ matrix.shard }} ${{ inputs.target-platform == 'macos' && 2 || 3 }})
# Run tests
if [ "`uname`" = "Darwin" ]; then
@@ -225,13 +225,12 @@ jobs:
cd src\electron
echo ELECTRON_TEST_RESULTS_DIR=$PWD\junit >> $env:GITHUB_ENV
# Get which tests are on this shard
$tests_files=node script\split-tests ${{ matrix.shard }} 4
$tests_files=node script\split-tests ${{ matrix.shard }} 2
echo tests_files=$tests_files >> $env:GITHUB_ENV
if ('${{ inputs.target-arch }}' -eq 'x86') {
echo npm_config_arch=ia32 >> $env:GITHUB_ENV
}
- name: Run Electron Tests (Windows)
timeout-minutes: 20
if: ${{ inputs.target-platform == 'windows' }}
shell: cmd
env: