From 083ec2f60a40f61718b43dab79407f098d70c5fd Mon Sep 17 00:00:00 2001 From: Jeremy Apthorp Date: Mon, 30 Jul 2018 13:25:49 -0700 Subject: [PATCH 1/4] ci: [gn] add ci build for gn on windows --- appveyor-gn.yml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 appveyor-gn.yml diff --git a/appveyor-gn.yml b/appveyor-gn.yml new file mode 100644 index 000000000000..57ce3cadfedf --- /dev/null +++ b/appveyor-gn.yml @@ -0,0 +1,36 @@ +version: 1.0.{build} +branches: + except: + - /^release$|^release-\d-\d-x$/ +build_cloud: libcc-20 +image: libcc-20-vs2017 +environment: + DISABLE_CRASH_REPORTER_TESTS: true + ELECTRON_ENABLE_LOGGING: true +build_script: + - git config --global core.longpaths true + - cd .. + - md src + - ps: Move-Item $env:APPVEYOR_BUILD_FOLDER -Destination src\electron + - ps: $env:CHROMIUM_BUILDTOOLS_PATH="$pwd\src\buildtools" + - >- + gclient config + --name "src\electron" + --unmanaged + --cache-dir "C:\Users\electron\libcc_cache" + "https://github.com/electron/electron" + - gclient sync --with_branch_heads --with_tags + - cd src + - gn gen out/Default "--args=import(\"//electron/build/args/debug.gn\")" + - ninja -C out/Default electron:electron_app +test_script: + - ninja -C out/Default electron/build/node:headers + - ps: $env:npm_config_nodedir="$pwd/out/Default/gen/node_headers" + - ps: Push-Location; cd electron/spec + - npm install + - ps: Pop-Location + - python -c "import subprocess; subprocess.check_call([\"./out/Default/electron.exe\", \"electron/spec\", \"--ci\"])" + # TODO(nornagon): verify-ffmpeg step +artifacts: +- path: test-results.xml + name: test-results.xml From 80d22e8dc08489d3b58d3eadf6b8bf32e525f706 Mon Sep 17 00:00:00 2001 From: Jeremy Apthorp Date: Tue, 31 Jul 2018 17:28:32 -0700 Subject: [PATCH 2/4] test out build matrix for debug/release --- appveyor-gn.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/appveyor-gn.yml b/appveyor-gn.yml index 57ce3cadfedf..a47b6171dff7 100644 --- a/appveyor-gn.yml +++ b/appveyor-gn.yml @@ -7,6 +7,9 @@ image: libcc-20-vs2017 environment: DISABLE_CRASH_REPORTER_TESTS: true ELECTRON_ENABLE_LOGGING: true + matrix: + - gn_args: debug + - gn_args: release build_script: - git config --global core.longpaths true - cd .. @@ -21,7 +24,7 @@ build_script: "https://github.com/electron/electron" - gclient sync --with_branch_heads --with_tags - cd src - - gn gen out/Default "--args=import(\"//electron/build/args/debug.gn\")" + - gn gen out/Default "--args=import(\"//electron/build/args/%gn_args%.gn\")" - ninja -C out/Default electron:electron_app test_script: - ninja -C out/Default electron/build/node:headers From 63604278ecda9a3796070c535e140679aec2fb66 Mon Sep 17 00:00:00 2001 From: Jeremy Apthorp Date: Wed, 1 Aug 2018 10:29:35 -0700 Subject: [PATCH 3/4] Add env var to skip native module tests --- appveyor-gn.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor-gn.yml b/appveyor-gn.yml index a47b6171dff7..2aa6e87ce182 100644 --- a/appveyor-gn.yml +++ b/appveyor-gn.yml @@ -9,6 +9,7 @@ environment: ELECTRON_ENABLE_LOGGING: true matrix: - gn_args: debug + ELECTRON_SKIP_NATIVE_MODULE_TESTS: 1 - gn_args: release build_script: - git config --global core.longpaths true From 651e7d21c4c1e66102d9cdfb1230921adffb41f7 Mon Sep 17 00:00:00 2001 From: Jeremy Apthorp Date: Wed, 1 Aug 2018 10:35:03 -0700 Subject: [PATCH 4/4] Try setting npm_config_msvs_version --- appveyor-gn.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor-gn.yml b/appveyor-gn.yml index 2aa6e87ce182..e087d27ca527 100644 --- a/appveyor-gn.yml +++ b/appveyor-gn.yml @@ -30,6 +30,7 @@ build_script: test_script: - ninja -C out/Default electron/build/node:headers - ps: $env:npm_config_nodedir="$pwd/out/Default/gen/node_headers" + - ps: $env:npm_config_msvs_version="2017" - ps: Push-Location; cd electron/spec - npm install - ps: Pop-Location