Merge pull request #12615 from nvaccess/appveyor-tagged

Separate appveyor projects

appveyor/README.md

@@ -1,4 +1,12 @@
-`appveyor.yml` specifies build settings which generally [override online UI driven settings](https://www.appveyor.com/docs/build-configuration/#appveyoryml-and-ui-coexistence). 
+`*.yml` config files specify build settings which generally [override online UI driven settings](https://www.appveyor.com/docs/build-configuration/#appveyoryml-and-ui-coexistence).
+
+We have multiple appveyor projects which correspond to various appveyor\*.yml config files.
+
+project name|url|config file|priority|notes
+:--|:--|:--|:--|:--
+NVDA|[nvda](https://ci.appveyor.com/project/NVAccess/nvda)|appveyor.yml|3|Legacy project that operates as we move other branches to the new projects
+NVDA tagged releases|[nvda-tagged-releases](https://ci.appveyor.com/project/NVAccess/nvda-tagged-releases)|appveyor/config-tagged.yml|1|Builds anything that is a tagged release.
+NVDA CI/CD|[nvda-ci-cd](https://ci.appveyor.com/project/NVAccess/nvda-ci-cd)|appveyor/config-non-tagged.yml|2|Builds anything that is not a tagged release.
 
 # Branch and tag filtering
 

appveyor.yml → appveyor/config-non-tagged.yml

@@ -1,6 +1,8 @@
 os: Visual Studio 2019
 version: "{branch}-{build}"
 
+skip_tags: true
+
 branches:
  only:
   - master

appveyor/config-tagged.yml

@@ -0,0 +1,61 @@
+os: Visual Studio 2019
+version: "{branch}-{build}"
+
+skip_non_tags: true
+
+branches:
+ only:
+  - master
+  - beta
+  - rc
+  - /try-.*/
+  - /release-.*/
+
+environment:
+ PY_PYTHON: 3.7-32
+ secure_authenticode_pass:
+  secure: Way+hJyhbiLG/cmCo4+dHHzS5DiSvk/45o6frnIQ27GBX6nVDsh7jwQ7fSnqxBRP
+ secure_ssh_pass:
+  secure: ekOvuyywHuDdGZmRmoj+b3jfrq39A2xlx4RD5ZUGd/8=
+ mozillaSymsAuthToken:
+  secure: p37Fxo78fsRdmR8v8TPz978QvVaqvbjdIBzFe8ZOpX0FUprm46rkhd374QM1CqMO
+ symstore: C:\Program Files (x86)\Windows Kits\10\Debuggers\x64\symstore.exe
+
+install:
+ - ps: appveyor\scripts\setBuildVersionVars.ps1
+ - ps: appveyor\scripts\decryptFilesForSigning.ps1
+ - py -m pip install --upgrade --no-warn-script-location pip
+ - git submodule update --init
+
+build_script:
+ - ps: appveyor\scripts\setSconsArgs.ps1
+ - scons source %sconsArgs%
+ - scons %sconsOutTargets% %sconsArgs%
+ - ps: appveyor\scripts\buildSymbolStore.ps1
+ - 7z a -tzip -r output\symbols.zip symbols\*.dl_ symbols\*.ex_ symbols\*.pd_
+
+before_test:
+ - ps: appveyor\scripts\tests\beforeTests.ps1
+ - ps: appveyor\scripts\installNVDA.ps1
+
+test_script:
+ - ps: appveyor\scripts\tests\translationCheck.ps1
+ - ps: appveyor\scripts\tests\unitTests.ps1
+ - ps: appveyor\scripts\tests\lintCheck.ps1
+ - ps: appveyor\scripts\tests\systemTests.ps1
+
+after_test:
+ - ps: appveyor\scripts\tests\checkTestFailure.ps1
+
+artifacts:
+ - path: output\*
+ - path: output\*\*
+
+deploy_script:
+ - ps: appveyor\scripts\deployScript.ps1
+
+on_failure:
+ - ps: appveyor\scripts\uploadArtifacts.ps1
+
+on_finish:
+ - ps: appveyor\scripts\pushPackagingInfo.ps1

appveyor/scripts/decryptFilesForSigning.ps1

@@ -1,12 +1,12 @@
 if(!$env:APPVEYOR_PULL_REQUEST_NUMBER) {
 	openssl enc -d -md sha256 -aes-256-cbc -pbkdf2 -salt -pass pass:$env:secure_authenticode_pass -in appveyor\authenticode.pfx.enc -out appveyor\authenticode.pfx
 	if($LastExitCode -ne 0) {
-		$errorCode=1
+		$errorCode=$LastExitCode
 		Add-AppveyorMessage "Unable to decrypt authenticode certificate"
 	}
 	openssl enc -md md5 -aes-256-cbc -d -pass pass:$env:secure_ssh_pass -in appveyor\ssh_id_rsa.enc -out appveyor\ssh_id_rsa
 	if($LastExitCode -ne 0) {
-		$errorCode=1
+		$errorCode=$LastExitCode
 		Add-AppveyorMessage "Unable to decrypt ssh key"
 	}
 	# Install ssh stuff.