@@ -86,35 +86,27 @@ module.exports = config => {
8686 // configuration for CI mode
8787 if ( env . CI ) {
8888 console . error ( 'CI mode enabled' ) ;
89- if ( env . TRAVIS ) {
90- console . error ( 'Travis-CI detected' ) ;
91- bundleDirPath = path . join ( BASE_BUNDLE_DIR_PATH , env . TRAVIS_BUILD_ID ) ;
92- if ( env . SAUCE_USERNAME && env . SAUCE_ACCESS_KEY ) {
93- // correlate build/tunnel with Travis
94- sauceConfig = {
95- build : `TRAVIS #${ env . TRAVIS_BUILD_NUMBER } (${ env . TRAVIS_BUILD_ID } )` ,
96- tunnelIdentifier : env . TRAVIS_JOB_NUMBER ,
97- startConnect : false
98- } ;
99- console . error ( 'Configured SauceLabs' ) ;
100- } else {
101- console . error ( 'No SauceLabs credentials present' ) ;
102- }
103- } else if ( env . APPVEYOR ) {
104- throw new Error ( 'no browser tests should run on AppVeyor!' ) ;
89+ if ( env . GITHUB_RUN_ID ) {
90+ console . error ( 'Github Actions detected' ) ;
91+ bundleDirPath = path . join (
92+ BASE_BUNDLE_DIR_PATH ,
93+ `github-${ env . GITHUB_RUN_ID } _${ env . GITHUB_RUN_NUMBER } `
94+ ) ;
95+ sauceConfig = { } ;
10596 } else {
10697 console . error ( `Local environment (${ hostname } ) detected` ) ;
10798 // don't need to run sauce from Windows CI b/c travis does it.
10899 if ( env . SAUCE_USERNAME || env . SAUCE_ACCESS_KEY ) {
109100 const id = `${ hostname } (${ Date . now ( ) } )` ;
110101 sauceConfig = {
111102 build : id ,
112- tunnelIdentifier : id ,
113- startConnect : true
103+ tunnelIdentifier : id
114104 } ;
115105 console . error ( 'Configured SauceLabs' ) ;
116106 } else {
117- console . error ( 'No SauceLabs credentials present' ) ;
107+ console . error (
108+ 'No SauceLabs credentials present; set SAUCE_USERNAME and SAUCE_ACCESS_KEY env vars'
109+ ) ;
118110 }
119111 }
120112 }
@@ -199,16 +191,7 @@ const addSauceTests = (cfg, sauceLabs) => {
199191 ...cfg . customLaunchers ,
200192 ...customLaunchers
201193 } ,
202- sauceLabs : {
203- ...sauceLabs ,
204- public : 'public' ,
205- connectOptions : {
206- connectRetries : 2 ,
207- connectRetryTimeout : 30000 ,
208- detached : sauceLabs . startConnect ,
209- tunnelIdentifier : sauceLabs . tunnelIdentifier
210- }
211- } ,
194+ sauceLabs,
212195 concurrency : Infinity ,
213196 retryLimit : 1 ,
214197 captureTimeout : 120000 ,
0 commit comments