mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
Merge pull request #12182 from electron/update-libcc-2-0-x
Update to latest libchromiumcontent for 2-0-x
This commit is contained in:
@@ -8,6 +8,7 @@ pipeline {
|
||||
environment {
|
||||
TARGET_ARCH='arm64'
|
||||
DISPLAY=':99.0'
|
||||
MOCHA_TIMEOUT='60000'
|
||||
}
|
||||
stages {
|
||||
stage('Bootstrap') {
|
||||
|
||||
@@ -51,7 +51,11 @@
|
||||
if (!process.env.MOCHA_REPORTER) {
|
||||
mocha.ui('bdd').reporter(isCi ? 'tap' : 'html')
|
||||
}
|
||||
mocha.timeout(isCi ? 30000 : 10000)
|
||||
if (process.env.MOCHA_TIMEOUT && process.env.MOCHA_TIMEOUT > 0) {
|
||||
mocha.timeout(process.env.MOCHA_TIMEOUT)
|
||||
} else {
|
||||
mocha.timeout(isCi ? 30000 : 10000)
|
||||
}
|
||||
|
||||
const query = Mocha.utils.parseQuery(window.location.search || '')
|
||||
if (query.grep) mocha.grep(query.grep)
|
||||
|
||||
2
vendor/libchromiumcontent
vendored
2
vendor/libchromiumcontent
vendored
Submodule vendor/libchromiumcontent updated: 037e62d663...5a77d6578a
Reference in New Issue
Block a user