From f6fa4fb974af30401a9ab89cf472c9467061b581 Mon Sep 17 00:00:00 2001 From: Brian Hoffman Date: Mon, 4 Nov 2019 10:57:19 -0500 Subject: [PATCH 01/14] Remove 32-bit Windows/Linux builds --- build.sh | 64 -------------------------------------------------------- 1 file changed, 64 deletions(-) diff --git a/build.sh b/build.sh index 606fbd158..e996a77c2 100755 --- a/build.sh +++ b/build.sh @@ -54,11 +54,7 @@ case "$TRAVIS_OS_NAME" in "linux") echo 'Linux builds' - - echo 'Building Linux 32-bit Installer....' - echo 'Making dist directories' - mkdir dist/linux32 mkdir dist/linux64 echo 'Install npm packages for Linux' @@ -83,22 +79,6 @@ case "$TRAVIS_OS_NAME" in APPNAME="openbazaar2" - echo "Packaging Electron application" - electron-packager . ${APPNAME} --platform=linux --arch=ia32 --electronVersion=${ELECTRONVER} --ignore="OPENBAZAAR_TEMP" --overwrite --prune --out=dist - - echo 'Move go server to electron app' - mkdir dist/${APPNAME}-linux-ia32/resources/openbazaar-go/ - cp -rf OPENBAZAAR_TEMP/openbazaar-go-linux-386 dist/${APPNAME}-linux-ia32/resources/openbazaar-go - mv dist/${APPNAME}-linux-ia32/resources/openbazaar-go/openbazaar-go-linux-386 dist/${APPNAME}-linux-ia32/resources/openbazaar-go/openbazaard - rm -rf dist/${APPNAME}-linux-ia32/resources/app/.travis - chmod +x dist/${APPNAME}-linux-ia32/resources/openbazaar-go/openbazaard - - echo 'Create debian archive' - electron-installer-debian --config .travis/config_ia32.json - - echo 'Create RPM archive' - electron-installer-redhat --config .travis/config_ia32.json - echo 'Building Linux 64-bit Installer....' echo "Packaging Electron application" @@ -120,15 +100,6 @@ case "$TRAVIS_OS_NAME" in APPNAME="openbazaar2client" - echo "Packaging Electron application" - electron-packager . ${APPNAME} --platform=linux --arch=ia32 --ignore="OPENBAZAAR_TEMP" --electronVersion=${ELECTRONVER} --overwrite --prune --out=dist - - echo 'Create debian archive' - electron-installer-debian --config .travis/config_ia32.client.json - - echo 'Create RPM archive' - electron-installer-redhat --config .travis/config_ia32.client.json - echo 'Building Linux 64-bit Installer....' echo "Packaging Electron application" @@ -172,43 +143,8 @@ case "$TRAVIS_OS_NAME" in brew remove osslsigncode brew install mono osslsigncode - brew reinstall openssl@1.1 - # WINDOWS 32 - echo 'Building Windows 32-bit Installer...' - mkdir dist/win32 - - echo 'Running Electron Packager...' - electron-packager . OpenBazaar2 --asar --out=dist --ignore="OPENBAZAAR_TEMP" --protocol-name=OpenBazaar --win32metadata.ProductName="OpenBazaar2" --win32metadata.CompanyName="OpenBazaar" --win32metadata.FileDescription='Decentralized p2p marketplace for Bitcoin' --win32metadata.OriginalFilename=OpenBazaar2.exe --protocol=ob --platform=win32 --arch=ia32 --icon=imgs/openbazaar2.ico --electron-version=${ELECTRONVER} --overwrite - - echo 'Copying server binary into application folder...' - cp -rf OPENBAZAAR_TEMP/openbazaar-go-windows-4.0-386.exe dist/OpenBazaar2-win32-ia32/resources/ - cp -rf OPENBAZAAR_TEMP/libwinpthread-1.win32.dll dist/OpenBazaar2-win32-ia32/resources/libwinpthread-1.dll - mkdir dist/OpenBazaar2-win32-ia32/resources/openbazaar-go - mv dist/OpenBazaar2-win32-ia32/resources/openbazaar-go-windows-4.0-386.exe dist/OpenBazaar2-win32-ia32/resources/openbazaar-go/openbazaard.exe - mv dist/OpenBazaar2-win32-ia32/resources/libwinpthread-1.dll dist/OpenBazaar2-win32-ia32/resources/openbazaar-go/libwinpthread-1.dll - rm -rf dist/OPENBAZAAR_TEMP - - echo 'Building Installer...' - grunt create-windows-installer --appname=OpenBazaar2 --obversion=$PACKAGE_VERSION --appdir=dist/OpenBazaar2-win32-ia32 --outdir=dist/win32 - mv dist/win32/OpenBazaar2Setup.exe dist/win32/OpenBazaar2-$PACKAGE_VERSION-Setup-32.exe - mv dist/win32/RELEASES dist/RELEASES - - #### CLIENT ONLY - echo 'Running Electron Packager...' - electron-packager . OpenBazaar2Client --asar --out=dist --protocol-name=OpenBazaar --ignore="OPENBAZAAR_TEMP" --win32metadata.ProductName="OpenBazaar2Client" --win32metadata.CompanyName="OpenBazaar" --win32metadata.FileDescription='Decentralized p2p marketplace for Bitcoin' --win32metadata.OriginalFilename=OpenBazaar2Client.exe --protocol=ob --platform=win32 --arch=ia32 --icon=imgs/openbazaar2.ico --electron-version=${ELECTRONVER} --overwrite - - echo 'Building Installer...' - grunt create-windows-installer --appname=OpenBazaar2Client --obversion=$PACKAGE_VERSION --appdir=dist/OpenBazaar2Client-win32-ia32 --outdir=dist/win32 - mv dist/win32/OpenBazaar2ClientSetup.exe dist/win32/OpenBazaar2Client-$PACKAGE_VERSION-Setup-32.exe - - echo 'Sign the installer' - osslsigncode sign -t http://timestamp.digicert.com -h sha1 -key .travis/ob1.keyfile -pass "$OB1_SECRET" -certs .travis/ob1.cert.spc -in dist/win32/OpenBazaar2-$PACKAGE_VERSION-Setup-32.exe -out dist/win32/OpenBazaar2-$PACKAGE_VERSION-Setup-32.exe - osslsigncode sign -t http://timestamp.digicert.com -h sha1 -key .travis/ob1.keyfile -pass "$OB1_SECRET" -certs .travis/ob1.cert.spc -in dist/win32/OpenBazaar2Client-$PACKAGE_VERSION-Setup-32.exe -out dist/win32/OpenBazaar2Client-$PACKAGE_VERSION-Setup-32.exe - - rm dist/win32/RELEASES - # WINDOWS 64 echo 'Building Windows 64-bit Installer...' mkdir dist/win64 From 0150f0043846b981e3892b06d4b6fc9dfa3dccb6 Mon Sep 17 00:00:00 2001 From: Brian Hoffman Date: Thu, 14 Nov 2019 11:26:50 -0500 Subject: [PATCH 02/14] Back off osx version --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index e4d2e8654..b6d8153b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,6 +30,7 @@ jobs: env: BINARY=osxclient - os: linux - os: osx + osx_image: xcode9.2 env: BINARY=win script: - npm run lint From c26779f91a0f27f9100735201fad8741c69fa3b8 Mon Sep 17 00:00:00 2001 From: Brian Hoffman Date: Thu, 14 Nov 2019 11:53:47 -0500 Subject: [PATCH 03/14] DEBUG --- build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.sh b/build.sh index e996a77c2..c3fbcc806 100755 --- a/build.sh +++ b/build.sh @@ -149,6 +149,8 @@ case "$TRAVIS_OS_NAME" in echo 'Building Windows 64-bit Installer...' mkdir dist/win64 + export DEBUG=* + echo 'Running Electron Packager...' electron-packager . OpenBazaar2 --asar --out=dist --protocol-name=OpenBazaar --ignore="OPENBAZAAR_TEMP" --win32metadata.ProductName="OpenBazaar2" --win32metadata.CompanyName="OpenBazaar" --win32metadata.FileDescription='Decentralized p2p marketplace for Bitcoin' --win32metadata.OriginalFilename=OpenBazaar2.exe --protocol=ob --platform=win32 --arch=x64 --icon=imgs/openbazaar2.ico --electron-version=${ELECTRONVER} --overwrite From 3ca1719f3878e3a2774a25174b7a7a678c1c7728 Mon Sep 17 00:00:00 2001 From: Brian Hoffman Date: Thu, 14 Nov 2019 12:43:55 -0500 Subject: [PATCH 04/14] Enforce 32-bit wine --- build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sh b/build.sh index c3fbcc806..a55bcd222 100755 --- a/build.sh +++ b/build.sh @@ -150,6 +150,7 @@ case "$TRAVIS_OS_NAME" in mkdir dist/win64 export DEBUG=* + export WINEARCH=win32 echo 'Running Electron Packager...' electron-packager . OpenBazaar2 --asar --out=dist --protocol-name=OpenBazaar --ignore="OPENBAZAAR_TEMP" --win32metadata.ProductName="OpenBazaar2" --win32metadata.CompanyName="OpenBazaar" --win32metadata.FileDescription='Decentralized p2p marketplace for Bitcoin' --win32metadata.OriginalFilename=OpenBazaar2.exe --protocol=ob --platform=win32 --arch=x64 --icon=imgs/openbazaar2.ico --electron-version=${ELECTRONVER} --overwrite From b00942c6db93c2a8fe7f8deb4ece31a158398b59 Mon Sep 17 00:00:00 2001 From: Brian Hoffman Date: Thu, 14 Nov 2019 13:45:53 -0500 Subject: [PATCH 05/14] 64-bit wine --- build.sh | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/build.sh b/build.sh index a55bcd222..018bcbc6a 100755 --- a/build.sh +++ b/build.sh @@ -134,10 +134,10 @@ case "$TRAVIS_OS_NAME" in if [[ $BINARY == 'win' ]]; then - curl -L https://dl.bintray.com/develar/bin/7za -o /tmp/7za - chmod +x /tmp/7za - curl -L https://dl.bintray.com/develar/bin/wine.7z -o /tmp/wine.7z - /tmp/7za x -o/usr/local/Cellar -y /tmp/wine.7z +# curl -L https://dl.bintray.com/develar/bin/7za -o /tmp/7za +# chmod +x /tmp/7za +# curl -L https://dl.bintray.com/develar/bin/wine.7z -o /tmp/wine.7z +# /tmp/7za x -o/usr/local/Cellar -y /tmp/wine.7z brew link --overwrite fontconfig gd gnutls jasper libgphoto2 libicns libtasn1 libusb libusb-compat little-cms2 nettle openssl sane-backends webp wine git-lfs gnu-tar dpkg xz @@ -145,15 +145,23 @@ case "$TRAVIS_OS_NAME" in brew install mono osslsigncode brew reinstall openssl@1.1 + brew cask install wine + # WINDOWS 64 echo 'Building Windows 64-bit Installer...' mkdir dist/win64 - export DEBUG=* - export WINEARCH=win32 +# export DEBUG=* + export WINEARCH=win64 + + npm install electron-packager + + cd node_modules/electron-packager + npm install node-rcedit@2.1.0 + cd ../.. echo 'Running Electron Packager...' - electron-packager . OpenBazaar2 --asar --out=dist --protocol-name=OpenBazaar --ignore="OPENBAZAAR_TEMP" --win32metadata.ProductName="OpenBazaar2" --win32metadata.CompanyName="OpenBazaar" --win32metadata.FileDescription='Decentralized p2p marketplace for Bitcoin' --win32metadata.OriginalFilename=OpenBazaar2.exe --protocol=ob --platform=win32 --arch=x64 --icon=imgs/openbazaar2.ico --electron-version=${ELECTRONVER} --overwrite + node_modules/electron-packager/bin/electron-packager.js . OpenBazaar2 --asar --out=dist --protocol-name=OpenBazaar --ignore="OPENBAZAAR_TEMP" --win32metadata.ProductName="OpenBazaar2" --win32metadata.CompanyName="OpenBazaar" --win32metadata.FileDescription='Decentralized p2p marketplace for Bitcoin' --win32metadata.OriginalFilename=OpenBazaar2.exe --protocol=ob --platform=win32 --arch=x64 --icon=imgs/openbazaar2.ico --electron-version=${ELECTRONVER} --overwrite echo 'Copying server binary into application folder...' cp -rf OPENBAZAAR_TEMP/openbazaar-go-windows-4.0-amd64.exe dist/OpenBazaar2-win32-x64/resources/ From e478c84796702788c37dfa6bac893539fa20096a Mon Sep 17 00:00:00 2001 From: Brian Hoffman Date: Thu, 14 Nov 2019 13:59:29 -0500 Subject: [PATCH 06/14] Fix repo names --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 018bcbc6a..23c26ac6a 100755 --- a/build.sh +++ b/build.sh @@ -145,7 +145,7 @@ case "$TRAVIS_OS_NAME" in brew install mono osslsigncode brew reinstall openssl@1.1 - brew cask install wine + brew cask install wine-stable # WINDOWS 64 echo 'Building Windows 64-bit Installer...' @@ -157,7 +157,7 @@ case "$TRAVIS_OS_NAME" in npm install electron-packager cd node_modules/electron-packager - npm install node-rcedit@2.1.0 + npm install rcedit@2.1.0 cd ../.. echo 'Running Electron Packager...' From e5e1349d6a8719c87eaa972edcb214f160ef6770 Mon Sep 17 00:00:00 2001 From: Brian Hoffman Date: Thu, 14 Nov 2019 14:45:52 -0500 Subject: [PATCH 07/14] Add debugging --- build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.sh b/build.sh index 23c26ac6a..904fd2a90 100755 --- a/build.sh +++ b/build.sh @@ -160,6 +160,8 @@ case "$TRAVIS_OS_NAME" in npm install rcedit@2.1.0 cd ../.. + export DEBUG=* + echo 'Running Electron Packager...' node_modules/electron-packager/bin/electron-packager.js . OpenBazaar2 --asar --out=dist --protocol-name=OpenBazaar --ignore="OPENBAZAAR_TEMP" --win32metadata.ProductName="OpenBazaar2" --win32metadata.CompanyName="OpenBazaar" --win32metadata.FileDescription='Decentralized p2p marketplace for Bitcoin' --win32metadata.OriginalFilename=OpenBazaar2.exe --protocol=ob --platform=win32 --arch=x64 --icon=imgs/openbazaar2.ico --electron-version=${ELECTRONVER} --overwrite From 84e32378726cf46890ce841da1e2f5daac57af13 Mon Sep 17 00:00:00 2001 From: Brian Hoffman Date: Thu, 14 Nov 2019 16:54:43 -0500 Subject: [PATCH 08/14] Revert osx_image --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b6d8153b3..e4d2e8654 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,6 @@ jobs: env: BINARY=osxclient - os: linux - os: osx - osx_image: xcode9.2 env: BINARY=win script: - npm run lint From 83a8b9c47d599f424b1e03ade25e5a84a29c2bbf Mon Sep 17 00:00:00 2001 From: Brian Hoffman Date: Thu, 14 Nov 2019 21:01:57 -0500 Subject: [PATCH 09/14] Upgrade OS X --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index e4d2e8654..7912cf6dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,6 +30,7 @@ jobs: env: BINARY=osxclient - os: linux - os: osx + osx_image: xcode11.2 env: BINARY=win script: - npm run lint From 2d77816da024ba59129f37ea3b07c445639f8dbf Mon Sep 17 00:00:00 2001 From: Brian Hoffman Date: Fri, 15 Nov 2019 09:36:13 -0500 Subject: [PATCH 10/14] Use different wine installation --- .travis.yml | 2 ++ build.sh | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7912cf6dd..38c0a2863 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,3 +63,5 @@ env: - secure: fQ4K2OvSakz0Fk+9X/WWFpPOFoK7IjpI7vAqhEhbH7X2q0iXQUZv1476e3wVQWYlwzks8NlLP4oPXzJm6xooh+1ftxh3q1qlyQlowZKvyqDx/IjOVlZXZoaivqCEwXSmkxH2MG5OL3hjhZr2MG8cai2nbcXPXiUDktGVZm4rJRtbvknPK5TZUMjs9YttvDKy35fa28gdFcXWzKOFerqHIibNzE4CtmAbBhJLgSxopJp3yUrhKhnwEnOA4A3xwFZTARmT02Kfu8y4hOwwylbmysDNT1zWZ9+aNRaB2jvw9DEIevtzcyrmYfTZdbY18nj3O+9Wg8qYPo7YrrSA0pK5NwO9qf5ldxKU4ThfNSMONHgAzZDibXKg9q+axr49PBgNze0YO6T3/ktMIqpP9UPuchrsDMBk54msyqH02drJhQ3FyNLX63Ljt5w20kUks2mQdd/az/NSNGcjH26hDiKUROd7SXTr+cPOOXd0vi/VN1F3AouGVeoaaLm62N0UIv/w+npxn/XDKJE9InHfiGc77KUpysEaA9ydOJ7+WnNSzdGv45pIo87z+/zm6m9yeI/G8IPgo54IHSyLEshLD4azo/egzBkihYPkztX0z2SnMgL9+ph6908R0oy9GV1HgfFzMvwFfR8a4iY/mSkQtaSb5xoAUz1MxxwFel3cQGKXOgU= - secure: i9WollMSh2QLEneqifPXPEvOX8Ec6Fb2l1zd+QJwEn0PlHgbDAlY5a0WECPyBYhK6ldRCYZU73MC3goH2bzK4W2i8+jaWXEIIfEh+gx5Hp1V8TmLzkegSWl4A4/+Z5OHw5zbowwYRIKtTvxoT4zpPfuiwfS8GJyn1VIxJ7tD4RyBf/ruM6p0hLeiml4tVt+JCx0hvR5qhZDOEz/Dysa/e/3PzotYmUtofxHBQg4ItzMVtiQSBDdxN6GGXVYYvTHJ/+WqeKepziojajhleHL6Yufp+iIrT5+moAU1CKCir1uI3kVIyqMT27q/14Qh9EikBEarnhM+dv9z9XZQ2hs7eHZhKVBx0rAIoR0VReiU+bPqXQBc6to8b7xaW3WpTRD5l6kSE9nhO8c1/u27nHqH9REFh2wqzQPRgTMkaNe7TX+MV0VxDkqLLKS5LNzxzW8jjI+m6RXs+OIg4NesKOAqLCS6vD8Z6gRmvQqEMBe7wCUH1W71E3U2CuGOuqdnxPvOabc48ojX0fGtmaKmINIgOBcru9V7SXeDabrmFbVLlbSSUePnGoC32LO2MgiroiiIlzr9TRkDauCZB4fWfS7YGS6IMYdgPUWvEViLCDlNIDudJLfEGZgaBELMHUJSGO7A6Zi4JHWEhwZ12WsZnwEfUUBspQzkh3Nt6OofQYn7Bbw= - secure: JvB92ziCZhA5o1nrw/DxmFWnCcdVnpR+7UcAAMuV7+UdLk5cUFryuEo2BJ7YN1BWXpDgQ7iPULPAWAZRO7vKny7LVJYlo9vFIcsSdbnS+rl5Z1OTtuto8KPNIEPISzBEL8iTH25hXvT1jgbyovf4q1Xl+nUW/3BjBAttktZrP7jnpQZBfWnLxPrZ+lRfBeoIp7cxzB/BEg1hG6/YkRfvBu7Ov/erA3L0IOXehcjgXZvg10raOGUSxgSvHS4Va4lX5E1N6k4qtD79LhS6SV7e4QOi1Dhd4aeeUZtYBrSo/AqsXsrULGtbePeFJMH+Y1M3zjIRBOWQcWMjgxlNh5H/StVJSzsODU6++ubZ6zqB3sQTaT1jQYXJUmoSgnykp6H+ikufSlasWZWvTm5gyJ5nd3Kn1CsP2iB2SCV+w6l7eUnjsyb2R9CPG8j/5m1wYx5iGC/9Ot2lAVCwrPRYuw6gLUOO6BVCV3Kz+tBPFtdAP7jpfl6jhlKCtmkovRY+As3zKU+uEHGqB26J5kIp/apiU6czHvHTa4pRbaXgULhegpDE2ccT62Q8Z8O1U3bmZG5cVEGQHhjMrYW1Y3HchfdJ/jhIRSQopFK4WE+BJV0YP1qiMh3WqCFdhCyQrRGGGWBqrfkNuTyNjMCBmThLTIE+kd3XZyXeokFbfxcDSf7Wu90= + - WINEDLLOVERRIDES="mscoree,mshtml=" + - WINEDEBUG="-all" \ No newline at end of file diff --git a/build.sh b/build.sh index 904fd2a90..3824f3603 100755 --- a/build.sh +++ b/build.sh @@ -139,13 +139,13 @@ case "$TRAVIS_OS_NAME" in # curl -L https://dl.bintray.com/develar/bin/wine.7z -o /tmp/wine.7z # /tmp/7za x -o/usr/local/Cellar -y /tmp/wine.7z - brew link --overwrite fontconfig gd gnutls jasper libgphoto2 libicns libtasn1 libusb libusb-compat little-cms2 nettle openssl sane-backends webp wine git-lfs gnu-tar dpkg xz + brew link --overwrite fontconfig gd gnutls jasper libgphoto2 libicns libtasn1 libusb libusb-compat little-cms2 nettle openssl sane-backends webp git-lfs gnu-tar dpkg xz brew remove osslsigncode brew install mono osslsigncode brew reinstall openssl@1.1 - brew cask install wine-stable +# brew cask install wine-stable # WINDOWS 64 echo 'Building Windows 64-bit Installer...' @@ -154,6 +154,8 @@ case "$TRAVIS_OS_NAME" in # export DEBUG=* export WINEARCH=win64 + npm install wine-darwin@1.9.17-1 + ./node_modules/.bin/wine hostname npm install electron-packager cd node_modules/electron-packager From 024bde5e16e225d5a3da5933d512762a7d245f65 Mon Sep 17 00:00:00 2001 From: Brian Hoffman Date: Fri, 15 Nov 2019 10:19:48 -0500 Subject: [PATCH 11/14] wine-stable --- build.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index 3824f3603..904fd2a90 100755 --- a/build.sh +++ b/build.sh @@ -139,13 +139,13 @@ case "$TRAVIS_OS_NAME" in # curl -L https://dl.bintray.com/develar/bin/wine.7z -o /tmp/wine.7z # /tmp/7za x -o/usr/local/Cellar -y /tmp/wine.7z - brew link --overwrite fontconfig gd gnutls jasper libgphoto2 libicns libtasn1 libusb libusb-compat little-cms2 nettle openssl sane-backends webp git-lfs gnu-tar dpkg xz + brew link --overwrite fontconfig gd gnutls jasper libgphoto2 libicns libtasn1 libusb libusb-compat little-cms2 nettle openssl sane-backends webp wine git-lfs gnu-tar dpkg xz brew remove osslsigncode brew install mono osslsigncode brew reinstall openssl@1.1 -# brew cask install wine-stable + brew cask install wine-stable # WINDOWS 64 echo 'Building Windows 64-bit Installer...' @@ -154,8 +154,6 @@ case "$TRAVIS_OS_NAME" in # export DEBUG=* export WINEARCH=win64 - npm install wine-darwin@1.9.17-1 - ./node_modules/.bin/wine hostname npm install electron-packager cd node_modules/electron-packager From d9d30fa8a340216d992ca214bd3f67915c72cb74 Mon Sep 17 00:00:00 2001 From: Brian Hoffman Date: Fri, 15 Nov 2019 12:15:26 -0500 Subject: [PATCH 12/14] Remove RELEASE move --- build.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.sh b/build.sh index 904fd2a90..edd0e8425 100755 --- a/build.sh +++ b/build.sh @@ -189,8 +189,6 @@ case "$TRAVIS_OS_NAME" in osslsigncode sign -t http://timestamp.digicert.com -h sha1 -key .travis/ob1.keyfile -pass "$OB1_SECRET" -certs .travis/ob1.cert.spc -in dist/win64/OpenBazaar2-$PACKAGE_VERSION-Setup-64.exe -out dist/win64/OpenBazaar2-$PACKAGE_VERSION-Setup-64.exe osslsigncode sign -t http://timestamp.digicert.com -h sha1 -key .travis/ob1.keyfile -pass "$OB1_SECRET" -certs .travis/ob1.cert.spc -in dist/win64/OpenBazaar2Client-$PACKAGE_VERSION-Setup-64.exe -out dist/win64/OpenBazaar2Client-$PACKAGE_VERSION-Setup-64.exe - mv dist/RELEASES dist/win32/RELEASES - else # OSX From 5e5c01363a2fe32858d55c2dc77fe79fb53453f8 Mon Sep 17 00:00:00 2001 From: Brian Hoffman Date: Fri, 15 Nov 2019 13:23:29 -0500 Subject: [PATCH 13/14] Fix RELEASES file upload --- .travis.yml | 6 ++---- build.sh | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 38c0a2863..baab15820 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,9 +41,7 @@ deploy: api_key: "$GITHUB_TOKEN" file_glob: true file: - - "dist/win32/*.exe" - - "dist/win32/*.nupkg" - - "dist/win32/RELEASES" + - "dist/win64/RELEASES" - "dist/win64/*.exe" - "dist/win64/*.nupkg" - "dist/osx/*.dmg" @@ -64,4 +62,4 @@ env: - secure: i9WollMSh2QLEneqifPXPEvOX8Ec6Fb2l1zd+QJwEn0PlHgbDAlY5a0WECPyBYhK6ldRCYZU73MC3goH2bzK4W2i8+jaWXEIIfEh+gx5Hp1V8TmLzkegSWl4A4/+Z5OHw5zbowwYRIKtTvxoT4zpPfuiwfS8GJyn1VIxJ7tD4RyBf/ruM6p0hLeiml4tVt+JCx0hvR5qhZDOEz/Dysa/e/3PzotYmUtofxHBQg4ItzMVtiQSBDdxN6GGXVYYvTHJ/+WqeKepziojajhleHL6Yufp+iIrT5+moAU1CKCir1uI3kVIyqMT27q/14Qh9EikBEarnhM+dv9z9XZQ2hs7eHZhKVBx0rAIoR0VReiU+bPqXQBc6to8b7xaW3WpTRD5l6kSE9nhO8c1/u27nHqH9REFh2wqzQPRgTMkaNe7TX+MV0VxDkqLLKS5LNzxzW8jjI+m6RXs+OIg4NesKOAqLCS6vD8Z6gRmvQqEMBe7wCUH1W71E3U2CuGOuqdnxPvOabc48ojX0fGtmaKmINIgOBcru9V7SXeDabrmFbVLlbSSUePnGoC32LO2MgiroiiIlzr9TRkDauCZB4fWfS7YGS6IMYdgPUWvEViLCDlNIDudJLfEGZgaBELMHUJSGO7A6Zi4JHWEhwZ12WsZnwEfUUBspQzkh3Nt6OofQYn7Bbw= - secure: JvB92ziCZhA5o1nrw/DxmFWnCcdVnpR+7UcAAMuV7+UdLk5cUFryuEo2BJ7YN1BWXpDgQ7iPULPAWAZRO7vKny7LVJYlo9vFIcsSdbnS+rl5Z1OTtuto8KPNIEPISzBEL8iTH25hXvT1jgbyovf4q1Xl+nUW/3BjBAttktZrP7jnpQZBfWnLxPrZ+lRfBeoIp7cxzB/BEg1hG6/YkRfvBu7Ov/erA3L0IOXehcjgXZvg10raOGUSxgSvHS4Va4lX5E1N6k4qtD79LhS6SV7e4QOi1Dhd4aeeUZtYBrSo/AqsXsrULGtbePeFJMH+Y1M3zjIRBOWQcWMjgxlNh5H/StVJSzsODU6++ubZ6zqB3sQTaT1jQYXJUmoSgnykp6H+ikufSlasWZWvTm5gyJ5nd3Kn1CsP2iB2SCV+w6l7eUnjsyb2R9CPG8j/5m1wYx5iGC/9Ot2lAVCwrPRYuw6gLUOO6BVCV3Kz+tBPFtdAP7jpfl6jhlKCtmkovRY+As3zKU+uEHGqB26J5kIp/apiU6czHvHTa4pRbaXgULhegpDE2ccT62Q8Z8O1U3bmZG5cVEGQHhjMrYW1Y3HchfdJ/jhIRSQopFK4WE+BJV0YP1qiMh3WqCFdhCyQrRGGGWBqrfkNuTyNjMCBmThLTIE+kd3XZyXeokFbfxcDSf7Wu90= - WINEDLLOVERRIDES="mscoree,mshtml=" - - WINEDEBUG="-all" \ No newline at end of file + - WINEDEBUG="-all" diff --git a/build.sh b/build.sh index edd0e8425..b76950713 100755 --- a/build.sh +++ b/build.sh @@ -189,6 +189,8 @@ case "$TRAVIS_OS_NAME" in osslsigncode sign -t http://timestamp.digicert.com -h sha1 -key .travis/ob1.keyfile -pass "$OB1_SECRET" -certs .travis/ob1.cert.spc -in dist/win64/OpenBazaar2-$PACKAGE_VERSION-Setup-64.exe -out dist/win64/OpenBazaar2-$PACKAGE_VERSION-Setup-64.exe osslsigncode sign -t http://timestamp.digicert.com -h sha1 -key .travis/ob1.keyfile -pass "$OB1_SECRET" -certs .travis/ob1.cert.spc -in dist/win64/OpenBazaar2Client-$PACKAGE_VERSION-Setup-64.exe -out dist/win64/OpenBazaar2Client-$PACKAGE_VERSION-Setup-64.exe + mv dist/win64/RELEASES-x64 dist/win64/RELEASES + else # OSX From 78f3ec230333569950591539da807bf768cbde03 Mon Sep 17 00:00:00 2001 From: Brian Hoffman Date: Fri, 15 Nov 2019 13:25:22 -0500 Subject: [PATCH 14/14] Remove commented code and debug flags --- build.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/build.sh b/build.sh index b76950713..fd0845104 100755 --- a/build.sh +++ b/build.sh @@ -134,11 +134,6 @@ case "$TRAVIS_OS_NAME" in if [[ $BINARY == 'win' ]]; then -# curl -L https://dl.bintray.com/develar/bin/7za -o /tmp/7za -# chmod +x /tmp/7za -# curl -L https://dl.bintray.com/develar/bin/wine.7z -o /tmp/wine.7z -# /tmp/7za x -o/usr/local/Cellar -y /tmp/wine.7z - brew link --overwrite fontconfig gd gnutls jasper libgphoto2 libicns libtasn1 libusb libusb-compat little-cms2 nettle openssl sane-backends webp wine git-lfs gnu-tar dpkg xz brew remove osslsigncode @@ -151,7 +146,6 @@ case "$TRAVIS_OS_NAME" in echo 'Building Windows 64-bit Installer...' mkdir dist/win64 -# export DEBUG=* export WINEARCH=win64 npm install electron-packager @@ -160,8 +154,6 @@ case "$TRAVIS_OS_NAME" in npm install rcedit@2.1.0 cd ../.. - export DEBUG=* - echo 'Running Electron Packager...' node_modules/electron-packager/bin/electron-packager.js . OpenBazaar2 --asar --out=dist --protocol-name=OpenBazaar --ignore="OPENBAZAAR_TEMP" --win32metadata.ProductName="OpenBazaar2" --win32metadata.CompanyName="OpenBazaar" --win32metadata.FileDescription='Decentralized p2p marketplace for Bitcoin' --win32metadata.OriginalFilename=OpenBazaar2.exe --protocol=ob --platform=win32 --arch=x64 --icon=imgs/openbazaar2.ico --electron-version=${ELECTRONVER} --overwrite