From b7c948c7ebb97e36d5575bbf9522e132bc7d70a6 Mon Sep 17 00:00:00 2001 From: Liam Cardenas Date: Tue, 12 Dec 2017 11:09:18 -0800 Subject: [PATCH 1/7] Testing new build configuration --- .appveyor.yml | 3 +++ build/build.ps1 | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 71e698523..2b9347684 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -13,6 +13,9 @@ environment: secure: iVGwoJ7ogspjSmuqr+haVPLglSgQsp6tUZx6mIlKH7Q= AWS_SECRET_ACCESS_KEY: secure: zKaqdZGPl0exDL5YhJkb33prSemC9Rzg9S7Lw2wFy1WnJ6ffgl6mQH7jqJDUTqsY + CSC_LINK: build\lbry3.pfx + CSC_KEY_PASSWORD: + secure: u6DydPcdrUJlxGL9uc7yQRYG8+5rY6aAEE9nfCSzFyNzZlX9NniOp8Uh5ZKQqX7bGEngLI6ipbLfiJvn0XFnhbn2iTkOuMqOXVJVOehvwlQ= skip_branch_with_pr: false diff --git a/build/build.ps1 b/build/build.ps1 index 465e43915..a5535abeb 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -30,7 +30,8 @@ dir dist # verify that binary was built/named correctly # sign binary nuget install secure-file -ExcludeVersion secure-file\tools\secure-file -decrypt build\lbry3.pfx.enc -secret "$env:pfx_key" -& ${env:SIGNTOOL_PATH} sign /f build\lbry3.pfx /p "$env:key_pass" /tr http://tsa.starfieldtech.com /td SHA256 /fd SHA256 dist\*.exe + +# & ${env:SIGNTOOL_PATH} sign /f build\lbry3.pfx /p "$env:key_pass" /tr http://tsa.starfieldtech.com /td SHA256 /fd SHA256 dist\*.exe python build\upload_assets.py From 3c03b5b3d62f1d171008f82080f2247413e3f5e9 Mon Sep 17 00:00:00 2001 From: Liam Cardenas Date: Tue, 12 Dec 2017 11:16:06 -0800 Subject: [PATCH 2/7] Try different path --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 2b9347684..6fda35053 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -13,7 +13,7 @@ environment: secure: iVGwoJ7ogspjSmuqr+haVPLglSgQsp6tUZx6mIlKH7Q= AWS_SECRET_ACCESS_KEY: secure: zKaqdZGPl0exDL5YhJkb33prSemC9Rzg9S7Lw2wFy1WnJ6ffgl6mQH7jqJDUTqsY - CSC_LINK: build\lbry3.pfx + CSC_LINK: C:\projects\lbry-app\build\lbry3.pfx CSC_KEY_PASSWORD: secure: u6DydPcdrUJlxGL9uc7yQRYG8+5rY6aAEE9nfCSzFyNzZlX9NniOp8Uh5ZKQqX7bGEngLI6ipbLfiJvn0XFnhbn2iTkOuMqOXVJVOehvwlQ= From 8f965231323e812e22642bdd671d875c09184553 Mon Sep 17 00:00:00 2001 From: Liam Cardenas Date: Tue, 12 Dec 2017 11:21:47 -0800 Subject: [PATCH 3/7] Added more verbose debugging options --- build/build.ps1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/build.ps1 b/build/build.ps1 index a5535abeb..fc4535ad1 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -30,6 +30,8 @@ dir dist # verify that binary was built/named correctly # sign binary nuget install secure-file -ExcludeVersion secure-file\tools\secure-file -decrypt build\lbry3.pfx.enc -secret "$env:pfx_key" +Write-Host "Testing for lbry3" +Test-Path build\lbry3.pfx # & ${env:SIGNTOOL_PATH} sign /f build\lbry3.pfx /p "$env:key_pass" /tr http://tsa.starfieldtech.com /td SHA256 /fd SHA256 dist\*.exe From 1953faf929a4dc4025d8939f61c0c47b236cb6e1 Mon Sep 17 00:00:00 2001 From: Liam Cardenas Date: Tue, 12 Dec 2017 11:43:32 -0800 Subject: [PATCH 4/7] Unencrpyted before building --- build/build.ps1 | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/build/build.ps1 b/build/build.ps1 index fc4535ad1..e5bbe9d3b 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -1,5 +1,13 @@ pip install -r build\requirements.txt +# sign binary +nuget install secure-file -ExcludeVersion +secure-file\tools\secure-file -decrypt build\lbry3.pfx.enc -secret "$env:pfx_key" +Write-Host "Testing for lbry3" +Test-Path build\lbry3.pfx + +# & ${env:SIGNTOOL_PATH} sign /f build\lbry3.pfx /p "$env:key_pass" /tr http://tsa.starfieldtech.com /td SHA256 /fd SHA256 dist\*.exe + # Get the latest stable version of Node.js or io.js Install-Product node $env:nodejs_version npm install -g yarn @@ -21,19 +29,8 @@ Expand-Archive daemon.zip -DestinationPath static\daemon\ dir static\daemon\ # verify that daemon binary is there rm daemon.zip - # build electron app yarn dist dir dist # verify that binary was built/named correctly - -# sign binary -nuget install secure-file -ExcludeVersion -secure-file\tools\secure-file -decrypt build\lbry3.pfx.enc -secret "$env:pfx_key" -Write-Host "Testing for lbry3" -Test-Path build\lbry3.pfx - -# & ${env:SIGNTOOL_PATH} sign /f build\lbry3.pfx /p "$env:key_pass" /tr http://tsa.starfieldtech.com /td SHA256 /fd SHA256 dist\*.exe - - python build\upload_assets.py From faabf2e22ee3f35fcd1d41a9ecca14692f685805 Mon Sep 17 00:00:00 2001 From: Liam Cardenas Date: Tue, 12 Dec 2017 12:03:55 -0800 Subject: [PATCH 5/7] Specify appveyor image version --- .appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index 6fda35053..fb9ba6898 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -19,6 +19,8 @@ environment: skip_branch_with_pr: false +image: Visual Studio 2017 + clone_folder: C:\projects\lbry-app build_script: From 6b662c40006335094fed7a8e381033e6faf3a14c Mon Sep 17 00:00:00 2001 From: Liam Cardenas Date: Tue, 12 Dec 2017 12:40:43 -0800 Subject: [PATCH 6/7] Test removing signtool path --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index fb9ba6898..3f7473f97 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -8,7 +8,7 @@ environment: pfx_key: secure: 1mwqyRy7hDqDjDK+TIAoaXyXzpNgwruFNA6TPkinUcVM7A+NLD33RQLnfnwVy+R5ovD2pUfhQ6+N0Fqebv6tZh436LIEsock+6IOdpgFwrg= # find with: Get-Childitem –Path "C:\Program Files (x86)\Microsoft SDKs\Windows\" -Include *signtool* -File -Recurse -ErrorAction SilentlyContinue - SIGNTOOL_PATH: C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Bin\signtool.exe + # SIGNTOOL_PATH: C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Bin\signtool.exe AWS_ACCESS_KEY_ID: secure: iVGwoJ7ogspjSmuqr+haVPLglSgQsp6tUZx6mIlKH7Q= AWS_SECRET_ACCESS_KEY: From abc01e8e12f550945d866be3bcd329d0ecd4dd43 Mon Sep 17 00:00:00 2001 From: Liam Cardenas Date: Tue, 12 Dec 2017 13:23:02 -0800 Subject: [PATCH 7/7] Cleanup Appveyor build scripts --- .appveyor.yml | 8 +------- build/build.ps1 | 6 +----- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 3f7473f97..237d2ee1b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -3,24 +3,18 @@ environment: nodejs_version: 7 GH_TOKEN: secure: LiI5jyuHUw6XbH4kC3gP1HX4P/v4rwD/gCNtaFhQu2AvJz1/1wALkp5ECnIxRySN - key_pass: - secure: u6DydPcdrUJlxGL9uc7yQRYG8+5rY6aAEE9nfCSzFyNzZlX9NniOp8Uh5ZKQqX7bGEngLI6ipbLfiJvn0XFnhbn2iTkOuMqOXVJVOehvwlQ= pfx_key: secure: 1mwqyRy7hDqDjDK+TIAoaXyXzpNgwruFNA6TPkinUcVM7A+NLD33RQLnfnwVy+R5ovD2pUfhQ6+N0Fqebv6tZh436LIEsock+6IOdpgFwrg= - # find with: Get-Childitem –Path "C:\Program Files (x86)\Microsoft SDKs\Windows\" -Include *signtool* -File -Recurse -ErrorAction SilentlyContinue - # SIGNTOOL_PATH: C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Bin\signtool.exe AWS_ACCESS_KEY_ID: secure: iVGwoJ7ogspjSmuqr+haVPLglSgQsp6tUZx6mIlKH7Q= AWS_SECRET_ACCESS_KEY: secure: zKaqdZGPl0exDL5YhJkb33prSemC9Rzg9S7Lw2wFy1WnJ6ffgl6mQH7jqJDUTqsY - CSC_LINK: C:\projects\lbry-app\build\lbry3.pfx + CSC_LINK: build\lbry3.pfx CSC_KEY_PASSWORD: secure: u6DydPcdrUJlxGL9uc7yQRYG8+5rY6aAEE9nfCSzFyNzZlX9NniOp8Uh5ZKQqX7bGEngLI6ipbLfiJvn0XFnhbn2iTkOuMqOXVJVOehvwlQ= skip_branch_with_pr: false -image: Visual Studio 2017 - clone_folder: C:\projects\lbry-app build_script: diff --git a/build/build.ps1 b/build/build.ps1 index e5bbe9d3b..3fb9d90b8 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -1,12 +1,8 @@ pip install -r build\requirements.txt -# sign binary +# Decrypt cert nuget install secure-file -ExcludeVersion secure-file\tools\secure-file -decrypt build\lbry3.pfx.enc -secret "$env:pfx_key" -Write-Host "Testing for lbry3" -Test-Path build\lbry3.pfx - -# & ${env:SIGNTOOL_PATH} sign /f build\lbry3.pfx /p "$env:key_pass" /tr http://tsa.starfieldtech.com /td SHA256 /fd SHA256 dist\*.exe # Get the latest stable version of Node.js or io.js Install-Product node $env:nodejs_version