From 9af86c42ef6052a35ccb496fdfa716b5c8e4c490 Mon Sep 17 00:00:00 2001 From: Cherif BOUCHELAGHEM Date: Mon, 18 Mar 2019 22:03:58 +0100 Subject: [PATCH 01/10] Adding MacOS support --- .travis.yml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9aad545..a199055 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,19 @@ sudo: true language: node_js +os: + - linux + - osx + osx_image: xcode10.1 + node_js: 8 addons: - firefox: latest - -os: - - linux \ No newline at end of file + apt: + packages: + - chromium-browser + +before_install: + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install chromium; fi + \ No newline at end of file From b1cd13a73f8ec993fa5e4b13c06641fe89b71956 Mon Sep 17 00:00:00 2001 From: Cherif BOUCHELAGHEM Date: Mon, 18 Mar 2019 22:09:06 +0100 Subject: [PATCH 02/10] update travis config --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a199055..3d5944c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,11 @@ sudo: true language: node_js -os: - - linux - - osx - osx_image: xcode10.1 +matrix: + include: + - os: linux + - os: osx + osx_image: xcode10.1 node_js: 8 From 0e4c23ef24547a6102a119ccc052202e542e79ac Mon Sep 17 00:00:00 2001 From: Cherif BOUCHELAGHEM Date: Mon, 18 Mar 2019 22:20:09 +0100 Subject: [PATCH 03/10] fix how brew install chromium --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3d5944c..71c148a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,5 +16,5 @@ addons: before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install chromium; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew cask install chromium; fi \ No newline at end of file From c9e1e21683af53413835f73e9a0a932897cf2c1b Mon Sep 17 00:00:00 2001 From: Cherif BOUCHELAGHEM Date: Mon, 18 Mar 2019 22:29:09 +0100 Subject: [PATCH 04/10] add firefox as addon --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 71c148a..c348d20 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ matrix: node_js: 8 addons: + firefox: latest apt: packages: - chromium-browser From 2a7801d18d897c64be52519f3e2ffae922a6bfc3 Mon Sep 17 00:00:00 2001 From: Cherif BOUCHELAGHEM Date: Mon, 18 Mar 2019 23:02:54 +0100 Subject: [PATCH 05/10] chromium doesn't work in macos --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c348d20..151ff87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,4 @@ addons: apt: packages: - chromium-browser - -before_install: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew cask install chromium; fi \ No newline at end of file From 87f77a1340783c5e19fcb5cb1cafa7ebacc5b857 Mon Sep 17 00:00:00 2001 From: Cherif BOUCHELAGHEM Date: Mon, 18 Mar 2019 23:33:17 +0100 Subject: [PATCH 06/10] use firefox for linux --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 151ff87..11721b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,13 +4,17 @@ language: node_js matrix: include: - os: linux + addons: + firefox: latest - os: osx osx_image: xcode10.1 + homebrew: + casks: + - chromium node_js: 8 addons: - firefox: latest apt: packages: - chromium-browser From 9d3a086caea2234339ee861c66aece5f03ffdb1b Mon Sep 17 00:00:00 2001 From: Cherif BOUCHELAGHEM Date: Mon, 18 Mar 2019 23:38:50 +0100 Subject: [PATCH 07/10] use chromium as addon --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 11721b7..c29e396 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,10 @@ matrix: firefox: latest - os: osx osx_image: xcode10.1 - homebrew: - casks: - - chromium + addons: + homebrew: + casks: + - chromium node_js: 8 From 2299f40a6d5a01915e61ba82a6e1fbb3f42c6b75 Mon Sep 17 00:00:00 2001 From: Cherif BOUCHELAGHEM Date: Mon, 18 Mar 2019 23:53:44 +0100 Subject: [PATCH 08/10] chrome for macos --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c29e396..f394951 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,12 +6,13 @@ matrix: - os: linux addons: firefox: latest + apt: + packages: + - chromium-browser - os: osx osx_image: xcode10.1 addons: - homebrew: - casks: - - chromium + chrome: stable node_js: 8 From 3aeced5b583c1b0ff8534cd7b191fb5a5325da4b Mon Sep 17 00:00:00 2001 From: Cherif BOUCHELAGHEM Date: Tue, 19 Mar 2019 00:06:34 +0100 Subject: [PATCH 09/10] run chromium without sandboxing --- .travis.yml | 9 +++------ lib/local/platform/macos.js | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index f394951..a97c73d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,12 +12,9 @@ matrix: - os: osx osx_image: xcode10.1 addons: - chrome: stable + homebrew: + casks: + - chromium node_js: 8 - -addons: - apt: - packages: - - chromium-browser \ No newline at end of file diff --git a/lib/local/platform/macos.js b/lib/local/platform/macos.js index d6d8115..e74268c 100644 --- a/lib/local/platform/macos.js +++ b/lib/local/platform/macos.js @@ -31,7 +31,7 @@ module.exports = { versionKey: 'KSVersion', versionKey2: 'CFBundleShortVersionString', defaultLocation: '/Applications/Chromium.app', - args: ['--args'], + args: ['--no-sandbox'], opensTab: true }, firefox: { From 889fee6c81f63bcc6ed0e4b8d41e9b76a9c7a3b0 Mon Sep 17 00:00:00 2001 From: Cherif BOUCHELAGHEM Date: Tue, 19 Mar 2019 00:14:02 +0100 Subject: [PATCH 10/10] fix the build --- .travis.yml | 8 +++----- lib/local/platform/macos.js | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index a97c73d..cb398a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,9 @@ sudo: true language: node_js +node_js: + - 8 + matrix: include: - os: linux @@ -11,10 +14,5 @@ matrix: - chromium-browser - os: osx osx_image: xcode10.1 - addons: - homebrew: - casks: - - chromium -node_js: 8 \ No newline at end of file diff --git a/lib/local/platform/macos.js b/lib/local/platform/macos.js index e74268c..d6d8115 100644 --- a/lib/local/platform/macos.js +++ b/lib/local/platform/macos.js @@ -31,7 +31,7 @@ module.exports = { versionKey: 'KSVersion', versionKey2: 'CFBundleShortVersionString', defaultLocation: '/Applications/Chromium.app', - args: ['--no-sandbox'], + args: ['--args'], opensTab: true }, firefox: {