From 058c13e25258c977f6a56ccdd35532441d855d7a Mon Sep 17 00:00:00 2001 From: Jason Rudolph Date: Wed, 10 Jan 2018 17:24:43 -0500 Subject: [PATCH 1/9] Teach AppVeyor to run installer task for master branch --- appveyor.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 0e5abaa83..fbb04a20c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -45,7 +45,11 @@ build_script: IF [%APPVEYOR_REPO_BRANCH:~-9%]==[-releases] ( script\build.cmd --code-sign --compress-artifacts --create-windows-installer ) ELSE ( - ECHO Skipping installer and Atom build on non-release branch + IF [%APPVEYOR_REPO_BRANCH%]==[master] ( + script\build.cmd --code-sign --compress-artifacts --create-windows-installer + ) ELSE ( + ECHO Skipping installer and Atom build on non-release branch + ) ) ) ELSE ( ECHO Skipping installer build on non-installer build matrix row && From 44223185846f60f5cf15b0b99fe05643f981b683 Mon Sep 17 00:00:00 2001 From: Damien Guard Date: Wed, 10 Jan 2018 15:41:21 -0800 Subject: [PATCH 2/9] Build the right things on appveyor --- appveyor.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index fbb04a20c..f1972560b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -43,17 +43,20 @@ build_script: - SET SQUIRREL_TEMP=C:\tmp - IF [%TASK%]==[installer] ( IF [%APPVEYOR_REPO_BRANCH:~-9%]==[-releases] ( + ECHO Building on release branch - Creating production artifacts script\build.cmd --code-sign --compress-artifacts --create-windows-installer ) ELSE ( IF [%APPVEYOR_REPO_BRANCH%]==[master] ( - script\build.cmd --code-sign --compress-artifacts --create-windows-installer + ECHO Building on master branch - Creating signed zips + script\build.cmd --code-sign --compress-artifacts ) ELSE ( - ECHO Skipping installer and Atom build on non-release branch + ECHO Building on non-master branch - Creating unsigned zips + script\build.cmd --compress-artifacts ) ) ) ELSE ( - ECHO Skipping installer build on non-installer build matrix row && - script\build.cmd --code-sign --compress-artifacts + ECHO Test build only - Not creating artifacts + script\build.cmd ) test_script: From 5e64206f90fd2147d8604d7778a31318e9b954bc Mon Sep 17 00:00:00 2001 From: Damien Guard Date: Wed, 10 Jan 2018 15:45:57 -0800 Subject: [PATCH 3/9] Appveyor double-ampersand nonsense --- appveyor.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f1972560b..6526f0830 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -43,19 +43,19 @@ build_script: - SET SQUIRREL_TEMP=C:\tmp - IF [%TASK%]==[installer] ( IF [%APPVEYOR_REPO_BRANCH:~-9%]==[-releases] ( - ECHO Building on release branch - Creating production artifacts + ECHO Building on release branch - Creating production artifacts && script\build.cmd --code-sign --compress-artifacts --create-windows-installer ) ELSE ( IF [%APPVEYOR_REPO_BRANCH%]==[master] ( - ECHO Building on master branch - Creating signed zips + ECHO Building on master branch - Creating signed zips && script\build.cmd --code-sign --compress-artifacts ) ELSE ( - ECHO Building on non-master branch - Creating unsigned zips + ECHO Building on non-master branch - Creating unsigned zips && script\build.cmd --compress-artifacts ) ) ) ELSE ( - ECHO Test build only - Not creating artifacts + ECHO Test build only - Not creating artifacts && script\build.cmd ) From 63d3a47ea85f5a126a6d8c21d370d468da482645 Mon Sep 17 00:00:00 2001 From: Damien Guard Date: Wed, 10 Jan 2018 15:58:04 -0800 Subject: [PATCH 4/9] Do not sign PRs --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 6526f0830..86fcaadab 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -46,7 +46,7 @@ build_script: ECHO Building on release branch - Creating production artifacts && script\build.cmd --code-sign --compress-artifacts --create-windows-installer ) ELSE ( - IF [%APPVEYOR_REPO_BRANCH%]==[master] ( + IF [%APPVEYOR_REPO_BRANCH%]==[master] IF NOT DEFINED [%APPVEYOR_PULL_REQUEST_NUMBER%] ( ECHO Building on master branch - Creating signed zips && script\build.cmd --code-sign --compress-artifacts ) ELSE ( From cdb21a063fb56cc9b3f4d9e8d69f5d86388b3286 Mon Sep 17 00:00:00 2001 From: Jason Rudolph Date: Thu, 11 Jan 2018 08:06:38 -0500 Subject: [PATCH 5/9] Echo AppVeyor env vars for debugging --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 86fcaadab..2129016d5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -41,6 +41,8 @@ build_script: - CD %APPVEYOR_BUILD_FOLDER% - IF NOT EXIST C:\tmp MKDIR C:\tmp - SET SQUIRREL_TEMP=C:\tmp + - ECHO APPVEYOR_REPO_BRANCH is '%APPVEYOR_REPO_BRANCH' + - ECHO APPVEYOR_PULL_REQUEST_NUMBER is '%APPVEYOR_PULL_REQUEST_NUMBER%' - IF [%TASK%]==[installer] ( IF [%APPVEYOR_REPO_BRANCH:~-9%]==[-releases] ( ECHO Building on release branch - Creating production artifacts && From f5356eea99157dfd184c74b561fa7111bd8e721f Mon Sep 17 00:00:00 2001 From: Jason Rudolph Date: Thu, 11 Jan 2018 08:21:49 -0500 Subject: [PATCH 6/9] Echo AppVeyor env vars earlier --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 2129016d5..cfd5fc71f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -32,6 +32,8 @@ matrix: TASK: test install: + - ECHO APPVEYOR_REPO_BRANCH is '%APPVEYOR_REPO_BRANCH%' + - ECHO APPVEYOR_PULL_REQUEST_NUMBER is '%APPVEYOR_PULL_REQUEST_NUMBER%' - IF NOT EXIST %TEST_JUNIT_XML_ROOT% MKDIR %TEST_JUNIT_XML_ROOT% - SET PATH=C:\Program Files\Atom\resources\cli;%PATH% - ps: Install-Product node $env:NODE_VERSION $env:PLATFORM @@ -41,8 +43,6 @@ build_script: - CD %APPVEYOR_BUILD_FOLDER% - IF NOT EXIST C:\tmp MKDIR C:\tmp - SET SQUIRREL_TEMP=C:\tmp - - ECHO APPVEYOR_REPO_BRANCH is '%APPVEYOR_REPO_BRANCH' - - ECHO APPVEYOR_PULL_REQUEST_NUMBER is '%APPVEYOR_PULL_REQUEST_NUMBER%' - IF [%TASK%]==[installer] ( IF [%APPVEYOR_REPO_BRANCH:~-9%]==[-releases] ( ECHO Building on release branch - Creating production artifacts && From 9188b98b8e9a4a6c8e258ced620e11c7e52da2cd Mon Sep 17 00:00:00 2001 From: Jason Rudolph Date: Thu, 11 Jan 2018 08:28:34 -0500 Subject: [PATCH 7/9] =?UTF-8?q?Fix=20syntax=20...=20maybe=20=F0=9F=99=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index cfd5fc71f..03f8c2947 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -48,7 +48,7 @@ build_script: ECHO Building on release branch - Creating production artifacts && script\build.cmd --code-sign --compress-artifacts --create-windows-installer ) ELSE ( - IF [%APPVEYOR_REPO_BRANCH%]==[master] IF NOT DEFINED [%APPVEYOR_PULL_REQUEST_NUMBER%] ( + IF [%APPVEYOR_REPO_BRANCH%]==[master] IF NOT DEFINED APPVEYOR_PULL_REQUEST_NUMBER ( ECHO Building on master branch - Creating signed zips && script\build.cmd --code-sign --compress-artifacts ) ELSE ( From 9165488f38494c8075cfe7a4043ed09885e7d374 Mon Sep 17 00:00:00 2001 From: Jason Rudolph Date: Thu, 11 Jan 2018 08:56:43 -0500 Subject: [PATCH 8/9] Remove debugging logic --- appveyor.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 03f8c2947..be318f4cd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -32,8 +32,6 @@ matrix: TASK: test install: - - ECHO APPVEYOR_REPO_BRANCH is '%APPVEYOR_REPO_BRANCH%' - - ECHO APPVEYOR_PULL_REQUEST_NUMBER is '%APPVEYOR_PULL_REQUEST_NUMBER%' - IF NOT EXIST %TEST_JUNIT_XML_ROOT% MKDIR %TEST_JUNIT_XML_ROOT% - SET PATH=C:\Program Files\Atom\resources\cli;%PATH% - ps: Install-Product node $env:NODE_VERSION $env:PLATFORM From 992ebe352d01d68354a318f8ef64964f71464807 Mon Sep 17 00:00:00 2001 From: Jason Rudolph Date: Thu, 11 Jan 2018 09:01:59 -0500 Subject: [PATCH 9/9] Be kind to build queue: Skip installer for non-release/non-master branch --- appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index be318f4cd..c7f2d3f9e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -50,8 +50,7 @@ build_script: ECHO Building on master branch - Creating signed zips && script\build.cmd --code-sign --compress-artifacts ) ELSE ( - ECHO Building on non-master branch - Creating unsigned zips && - script\build.cmd --compress-artifacts + ECHO Skipping installer build for non-release/non-master branch ) ) ) ELSE (