@@ -196,10 +196,7 @@ jobs:
196196 # sudo security authorizationdb write com.apple.trust-settings.admin allow
197197 # cd src/electron
198198 # ./script/codesign/generate-identity.sh
199- - name : Install Datadog CLI
200- run : |
201- cd src/electron
202- node script/yarn global add @datadog/datadog-ci
199+
203200 - name : Run Electron Tests
204201 shell : bash
205202 env :
@@ -225,7 +222,7 @@ jobs:
225222 export ELECTRON_FORCE_TEST_SUITE_EXIT="true"
226223 fi
227224 fi
228- node script/yarn test --runners=main --enableRerun=3 --trace-uncaught --enable-logging --files $tests_files
225+ node script/yarn.js test --runners=main --enableRerun=3 --trace-uncaught --enable-logging --files $tests_files
229226 else
230227 chown :builduser .. && chmod g+w ..
231228 chown -R :builduser . && chmod -R g+w .
@@ -242,9 +239,14 @@ jobs:
242239 export MOCHA_TIMEOUT=180000
243240 echo "Piping output to ASAN_SYMBOLIZE ($ASAN_SYMBOLIZE)"
244241 cd electron
245- runuser -u builduser -- xvfb-run script/actions/run-tests.sh script/yarn test --runners=main --trace-uncaught --enable-logging --files $tests_files | $ASAN_SYMBOLIZE
242+ runuser -u builduser -- xvfb-run script/actions/run-tests.sh script/yarn.js test --runners=main --trace-uncaught --enable-logging --files $tests_files | $ASAN_SYMBOLIZE
246243 else
247- runuser -u builduser -- xvfb-run script/actions/run-tests.sh script/yarn test --runners=main --trace-uncaught --enable-logging --files $tests_files
244+ if [ "${{ inputs.target-arch }}" = "arm" ]; then
245+ runuser -u builduser -- xvfb-run script/actions/run-tests.sh script/yarn.js test --skipYarnInstall --runners=main --trace-uncaught --enable-logging --files $tests_files
246+ else
247+ runuser -u builduser -- xvfb-run script/actions/run-tests.sh script/yarn.js test --runners=main --trace-uncaught --enable-logging --files $tests_files
248+ fi
249+
248250 fi
249251 fi
250252 - name : Upload Test results to Datadog
@@ -256,9 +258,10 @@ jobs:
256258 DD_TAGS : " os.architecture:${{ inputs.target-arch }},os.family:${{ inputs.target-platform }},os.platform:${{ inputs.target-platform }},asan:${{ inputs.is-asan }}"
257259 run : |
258260 if ! [ -z $DD_API_KEY ] && [ -f src/electron/junit/test-results-main.xml ]; then
259- export DATADOG_PATH=`node src/electron/script/yarn global bin`
260- $DATADOG_PATH/datadog-ci junit upload src/electron/junit/test-results-main.xml
261- fi
261+ cd src/electron
262+ export DATADOG_PATH=`node script/yarn.js bin datadog-ci`
263+ $DATADOG_PATH junit upload junit/test-results-main.xml
264+ fi
262265 if : always() && !cancelled()
263266 - name : Upload Test Artifacts
264267 if : always() && !cancelled()
0 commit comments