From 644803fb6eff22f45e4c58a68edff51d3b171c67 Mon Sep 17 00:00:00 2001 From: schaeff Date: Thu, 13 Jun 2019 14:38:29 +0200 Subject: [PATCH 1/7] enable windows build --- .travis.yml | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0b84cd377..00670ceb9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,19 +15,22 @@ env: matrix: include: # Linux - - env: TARGET=aarch64-unknown-linux-gnu - - env: TARGET=arm-unknown-linux-gnueabi - - env: TARGET=i686-unknown-linux-gnu - - env: TARGET=x86_64-unknown-linux-gnu + # - env: TARGET=aarch64-unknown-linux-gnu + # - env: TARGET=arm-unknown-linux-gnueabi + # - env: TARGET=i686-unknown-linux-gnu + # - env: TARGET=x86_64-unknown-linux-gnu - # OSX - - env: TARGET=i686-apple-darwin - os: osx - - env: TARGET=x86_64-apple-darwin - os: osx + # # OSX + # - env: TARGET=i686-apple-darwin + # os: osx + # - env: TARGET=x86_64-apple-darwin + # os: osx - # *BSD - - env: TARGET=x86_64-unknown-freebsd + # # *BSD + # - env: TARGET=x86_64-unknown-freebsd + + - env: TARGET=x86_64-pc-windows-gnu + - env: TARGET=x86_64-pc-windows-msvc before_install: - set -e @@ -60,11 +63,11 @@ before_cache: # Travis can't cache files that are not readable by "others" - chmod -R a+r $HOME/.cargo -branches: - only: - # release tags - - /^\d+\.\d+\.\d+.*$/ - - master +# branches: +# only: +# # release tags +# - /^\d+\.\d+\.\d+.*$/ +# - master notifications: email: From 7500a3a5f8e7952a62e67e7e41e76c69edd24896 Mon Sep 17 00:00:00 2001 From: schaeff Date: Thu, 13 Jun 2019 16:05:30 +0200 Subject: [PATCH 2/7] setup s3 --- .travis.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 00670ceb9..7eb577130 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,13 +49,12 @@ before_deploy: - sh ci/before_deploy.sh deploy: - api_key: - secure: cpo6ukDxL+h6Dw2A4eVaC0ddU/zguuds2yhHp1UE0DUWo/lpBNtg3bw51o/GrX8JyTWJCUMLZOKJyoyUWiht41BtlqRl5Egp/ugFEfCoPS+J6u0BIBEULwXrvOmxxF+K+DLH1MX179z1R2SYBYcm8V7GvygzAwaSP4fRq3Uwqr2l3lc6Q+V2kQ0Hylmeguaqhj9lG5BQA/fG1qlWdUMTHMInCCnb2z7SP3/kWEhkdCavCWtRjaeKoWSgKDcB/UUVVnRwnq5dE76DTJU6wEqG4njityxPTTZ+u0a5FiFnUhmqtqszicAs3jAKAcekyeM0B2prTF/xPGsPqLnce4ljoSK93VU08Ut1bJNMyfRLBzd/jEwOCp6ADUQnCTDxUP4Z2iK0EGya2ciXnZi/sCwPJZPV8uqUnfHdHYOdky1+64MJE1tBgC9ZaTcLFsATD6KkffKa2rmqgZCZNeHITs6HOGZhatw6u0eLknNqqBkQIMKvGRLjI6kZxDA2HsMYNTHPevUOKu68Kebi3aQG3H3OODXO3cKvGGoPHFx4uf3E5Gn4GJEePQqC1r5zYpdrQyOEN3VyLRZVHlAR/Kzm+5mameP4CyT8ppfLfQhy+sl6OfAV6X0Ap96gbWWj0I6w0CrZ10VLgJD2W5sllyiBnsNzkccW3Yg9DCuf75/ydme/JCc= - file_glob: true - file: $CRATE_NAME-$TRAVIS_TAG-$TARGET.* - on: - tags: true - provider: releases + provider: s3 + access_key_id: "AKIAITSVMKXUVHEDEPLQ" + secret_access_key: + secure: c5x4yaXDKdXdRiucNzFhoCBm8B3dJuRPpIn6rFD0IjaFR2c1Psc6rlHFDU0vBETq4kuATrjod7otyf0z0sqh3OacXvcTKjhoH86fmhbZrgaaMTLxMZBkQ6cICyudjkvol/IzTpbSptibsrqEsrPERYdYsgrXXlx7vgxHqjlMPYl+YmMNl2kwgDLla84tjQy0L1e/U/mLr7BTCEok2idSFxaPHSgB9xUcjlIZfKuEqnQdPntQiUn9672i6lQ2PW/QmnvF2EL7Jp9s5UTaT3eAR5Sq1hKHXfFMWRVkOBwvESH7lqDSl3t3NmR2lmzzvFe+O7jOQOtIjZHJ4CkiCvjLVxD6PrwqSjTFp0UNOHvgsWp15DQDYPRBmSkfCq767Di8mqALdr7ORGajcjUBKaZ8xGDPaqWo9jc/zksRa5dePNQMC3XB67/q9LFJqXwg23Cd22DuKo4wqgXbvQrnDSUiz/AIXTy4Z5XzMvHzV2p8wh+PPPey4jF969lg67l3WciQf1xb9jzKAf9yorOGDu6JT45I4i1DwYOGkJ1V+XNPGhKSegZ3JIP/SykyzyvfZKdl5yGM2pA9ddeJr5E7bd0esnVW6OrYTlx7DzEWfHLTTZXWPpufhMZb0Rsze1fllkT+T8p7rT7+jYfTHcjm9XykYRlctTLIeHf2636UM8bU7yQ= + bucket: "zokrates" + acl: public_read skip_cleanup: true cache: cargo From 942b0fb5211763795a953ad218fcfe5bf476d320 Mon Sep 17 00:00:00 2001 From: schaeff Date: Thu, 13 Jun 2019 16:13:37 +0200 Subject: [PATCH 3/7] allow branch --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7eb577130..952e61af2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,6 +56,8 @@ deploy: bucket: "zokrates" acl: public_read skip_cleanup: true + on: + branch: windows-build cache: cargo before_cache: From 2524844d58e30c58c8e77b2d39d40401621574be Mon Sep 17 00:00:00 2001 From: schaeff Date: Thu, 13 Jun 2019 16:32:50 +0200 Subject: [PATCH 4/7] add exe --- ci/before_deploy.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/before_deploy.sh b/ci/before_deploy.sh index 8aabbffea..a5bd2827d 100755 --- a/ci/before_deploy.sh +++ b/ci/before_deploy.sh @@ -21,7 +21,8 @@ main() { # Package artifacts # Binary - cp target/$TARGET/release/zokrates $stage/ + ls target/$TARGET/release/ + cp target/$TARGET/release/zokrates.exe $stage/ # Standard library cp -r zokrates_stdlib/stdlib $stage From b3b57d30a0417b465e32cb8ffd808204d0666747 Mon Sep 17 00:00:00 2001 From: schaeff Date: Thu, 13 Jun 2019 16:49:22 +0200 Subject: [PATCH 5/7] tweak --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 952e61af2..0e03231a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,9 +52,8 @@ deploy: provider: s3 access_key_id: "AKIAITSVMKXUVHEDEPLQ" secret_access_key: - secure: c5x4yaXDKdXdRiucNzFhoCBm8B3dJuRPpIn6rFD0IjaFR2c1Psc6rlHFDU0vBETq4kuATrjod7otyf0z0sqh3OacXvcTKjhoH86fmhbZrgaaMTLxMZBkQ6cICyudjkvol/IzTpbSptibsrqEsrPERYdYsgrXXlx7vgxHqjlMPYl+YmMNl2kwgDLla84tjQy0L1e/U/mLr7BTCEok2idSFxaPHSgB9xUcjlIZfKuEqnQdPntQiUn9672i6lQ2PW/QmnvF2EL7Jp9s5UTaT3eAR5Sq1hKHXfFMWRVkOBwvESH7lqDSl3t3NmR2lmzzvFe+O7jOQOtIjZHJ4CkiCvjLVxD6PrwqSjTFp0UNOHvgsWp15DQDYPRBmSkfCq767Di8mqALdr7ORGajcjUBKaZ8xGDPaqWo9jc/zksRa5dePNQMC3XB67/q9LFJqXwg23Cd22DuKo4wqgXbvQrnDSUiz/AIXTy4Z5XzMvHzV2p8wh+PPPey4jF969lg67l3WciQf1xb9jzKAf9yorOGDu6JT45I4i1DwYOGkJ1V+XNPGhKSegZ3JIP/SykyzyvfZKdl5yGM2pA9ddeJr5E7bd0esnVW6OrYTlx7DzEWfHLTTZXWPpufhMZb0Rsze1fllkT+T8p7rT7+jYfTHcjm9XykYRlctTLIeHf2636UM8bU7yQ= - bucket: "zokrates" - acl: public_read + secure: "WK3WkT3l1T8KMHtjs4IShyNkf6Q4XdLN25VfNPGJZOK/KNfwy7hrvajlxv3fvXpKa5WuxmdQfZdbFIvZomSN5useZkIGfVdTE4HgMr9t7iOzT4e1HDfenmgkhHmAgZ7K6W5YUrqI4aXQwfTNPTdMMZXDmWl5bQKOVTH3mYTB8JZgUy8Xvb9UHghJc2TDbqMzGCV+m5UxLiLOF4KhEqAKrNRcmv8FyUqzpwqSlv5OjbncRcH3WtnpTtbvHMz+NaoVgXem48QrnMXtr530DVosnJJmjIcVLDU1XIfZmLBNnYxsNQtWlwXkYJrqkGNk9jV//ItBA8d2VRfIx4Dvc7RgKd+GAUyfzfOznPgWF8bA+0Cfog1funXdhMrXLNLPxMb4pnCPcHvZp1z95AsisqiPGXdIHKGl3o/pmjUBBZPiN9MK6m05O3xluYDYbGDlDjqwbrCvV9VVAB/YlAi/1VA3jacyRkqwXFZhZD4MeXKvjqXxtFo+WYvaCvipaOfzyeW1g0PU3xreJtQArVfOXLgdrmHToeJJhjqZGPhkZO7M4rkFbH9Zt+JPgSudVP9Wcs81AeG8kKVPUIVuCOicsMquD4KYNFhhwOeUjaG+xI7G1G/QfIZWP8shC64w6GlO9xPd/eCA7TrIsC8b56Y2XrCqaeBKMoKxZM+rspQL9qYteyY=" + bucket: zokrates skip_cleanup: true on: branch: windows-build From 7c1a71398bb2ea3212320af2e332bca4e2a6187a Mon Sep 17 00:00:00 2001 From: schaeff Date: Thu, 13 Jun 2019 17:27:57 +0200 Subject: [PATCH 6/7] determine binary name, only upload zip --- .travis.yml | 1 + ci/before_deploy.sh | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0e03231a7..c0d939342 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,6 +51,7 @@ before_deploy: deploy: provider: s3 access_key_id: "AKIAITSVMKXUVHEDEPLQ" + file: $CRATE_NAME-$TRAVIS_TAG-$TARGET.* secret_access_key: secure: "WK3WkT3l1T8KMHtjs4IShyNkf6Q4XdLN25VfNPGJZOK/KNfwy7hrvajlxv3fvXpKa5WuxmdQfZdbFIvZomSN5useZkIGfVdTE4HgMr9t7iOzT4e1HDfenmgkhHmAgZ7K6W5YUrqI4aXQwfTNPTdMMZXDmWl5bQKOVTH3mYTB8JZgUy8Xvb9UHghJc2TDbqMzGCV+m5UxLiLOF4KhEqAKrNRcmv8FyUqzpwqSlv5OjbncRcH3WtnpTtbvHMz+NaoVgXem48QrnMXtr530DVosnJJmjIcVLDU1XIfZmLBNnYxsNQtWlwXkYJrqkGNk9jV//ItBA8d2VRfIx4Dvc7RgKd+GAUyfzfOznPgWF8bA+0Cfog1funXdhMrXLNLPxMb4pnCPcHvZp1z95AsisqiPGXdIHKGl3o/pmjUBBZPiN9MK6m05O3xluYDYbGDlDjqwbrCvV9VVAB/YlAi/1VA3jacyRkqwXFZhZD4MeXKvjqXxtFo+WYvaCvipaOfzyeW1g0PU3xreJtQArVfOXLgdrmHToeJJhjqZGPhkZO7M4rkFbH9Zt+JPgSudVP9Wcs81AeG8kKVPUIVuCOicsMquD4KYNFhhwOeUjaG+xI7G1G/QfIZWP8shC64w6GlO9xPd/eCA7TrIsC8b56Y2XrCqaeBKMoKxZM+rspQL9qYteyY=" bucket: zokrates diff --git a/ci/before_deploy.sh b/ci/before_deploy.sh index a5bd2827d..53f274008 100755 --- a/ci/before_deploy.sh +++ b/ci/before_deploy.sh @@ -15,6 +15,15 @@ main() { ;; esac + case $TARGET in + x86_64-pc-windows-gnu) + BINARY_NAME=zokrates.exe + ;; + *) + BINARY_NAME=zokrates + ;; + esac + test -f Cargo.lock || cargo generate-lockfile cross build --bin zokrates --target $TARGET --release @@ -22,7 +31,7 @@ main() { # Package artifacts # Binary ls target/$TARGET/release/ - cp target/$TARGET/release/zokrates.exe $stage/ + cp target/$TARGET/release/$BINARY_NAME $stage/ # Standard library cp -r zokrates_stdlib/stdlib $stage From 7d9b161909d000eb9a14e48ff6cb75c3ffbcc0cf Mon Sep 17 00:00:00 2001 From: schaeff Date: Thu, 13 Jun 2019 17:40:39 +0200 Subject: [PATCH 7/7] revert to github release --- .travis.yml | 47 ++++++++++++++++++++++----------------------- ci/before_deploy.sh | 1 - 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/.travis.yml b/.travis.yml index c0d939342..d37211692 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,22 +15,22 @@ env: matrix: include: # Linux - # - env: TARGET=aarch64-unknown-linux-gnu - # - env: TARGET=arm-unknown-linux-gnueabi - # - env: TARGET=i686-unknown-linux-gnu - # - env: TARGET=x86_64-unknown-linux-gnu + - env: TARGET=aarch64-unknown-linux-gnu + - env: TARGET=arm-unknown-linux-gnueabi + - env: TARGET=i686-unknown-linux-gnu + - env: TARGET=x86_64-unknown-linux-gnu - # # OSX - # - env: TARGET=i686-apple-darwin - # os: osx - # - env: TARGET=x86_64-apple-darwin - # os: osx + # OSX + - env: TARGET=i686-apple-darwin + os: osx + - env: TARGET=x86_64-apple-darwin + os: osx - # # *BSD - # - env: TARGET=x86_64-unknown-freebsd + # *BSD + - env: TARGET=x86_64-unknown-freebsd + # Windows - env: TARGET=x86_64-pc-windows-gnu - - env: TARGET=x86_64-pc-windows-msvc before_install: - set -e @@ -49,26 +49,25 @@ before_deploy: - sh ci/before_deploy.sh deploy: - provider: s3 - access_key_id: "AKIAITSVMKXUVHEDEPLQ" + api_key: + secure: cpo6ukDxL+h6Dw2A4eVaC0ddU/zguuds2yhHp1UE0DUWo/lpBNtg3bw51o/GrX8JyTWJCUMLZOKJyoyUWiht41BtlqRl5Egp/ugFEfCoPS+J6u0BIBEULwXrvOmxxF+K+DLH1MX179z1R2SYBYcm8V7GvygzAwaSP4fRq3Uwqr2l3lc6Q+V2kQ0Hylmeguaqhj9lG5BQA/fG1qlWdUMTHMInCCnb2z7SP3/kWEhkdCavCWtRjaeKoWSgKDcB/UUVVnRwnq5dE76DTJU6wEqG4njityxPTTZ+u0a5FiFnUhmqtqszicAs3jAKAcekyeM0B2prTF/xPGsPqLnce4ljoSK93VU08Ut1bJNMyfRLBzd/jEwOCp6ADUQnCTDxUP4Z2iK0EGya2ciXnZi/sCwPJZPV8uqUnfHdHYOdky1+64MJE1tBgC9ZaTcLFsATD6KkffKa2rmqgZCZNeHITs6HOGZhatw6u0eLknNqqBkQIMKvGRLjI6kZxDA2HsMYNTHPevUOKu68Kebi3aQG3H3OODXO3cKvGGoPHFx4uf3E5Gn4GJEePQqC1r5zYpdrQyOEN3VyLRZVHlAR/Kzm+5mameP4CyT8ppfLfQhy+sl6OfAV6X0Ap96gbWWj0I6w0CrZ10VLgJD2W5sllyiBnsNzkccW3Yg9DCuf75/ydme/JCc= + file_glob: true file: $CRATE_NAME-$TRAVIS_TAG-$TARGET.* - secret_access_key: - secure: "WK3WkT3l1T8KMHtjs4IShyNkf6Q4XdLN25VfNPGJZOK/KNfwy7hrvajlxv3fvXpKa5WuxmdQfZdbFIvZomSN5useZkIGfVdTE4HgMr9t7iOzT4e1HDfenmgkhHmAgZ7K6W5YUrqI4aXQwfTNPTdMMZXDmWl5bQKOVTH3mYTB8JZgUy8Xvb9UHghJc2TDbqMzGCV+m5UxLiLOF4KhEqAKrNRcmv8FyUqzpwqSlv5OjbncRcH3WtnpTtbvHMz+NaoVgXem48QrnMXtr530DVosnJJmjIcVLDU1XIfZmLBNnYxsNQtWlwXkYJrqkGNk9jV//ItBA8d2VRfIx4Dvc7RgKd+GAUyfzfOznPgWF8bA+0Cfog1funXdhMrXLNLPxMb4pnCPcHvZp1z95AsisqiPGXdIHKGl3o/pmjUBBZPiN9MK6m05O3xluYDYbGDlDjqwbrCvV9VVAB/YlAi/1VA3jacyRkqwXFZhZD4MeXKvjqXxtFo+WYvaCvipaOfzyeW1g0PU3xreJtQArVfOXLgdrmHToeJJhjqZGPhkZO7M4rkFbH9Zt+JPgSudVP9Wcs81AeG8kKVPUIVuCOicsMquD4KYNFhhwOeUjaG+xI7G1G/QfIZWP8shC64w6GlO9xPd/eCA7TrIsC8b56Y2XrCqaeBKMoKxZM+rspQL9qYteyY=" - bucket: zokrates - skip_cleanup: true on: - branch: windows-build + tags: true + provider: releases + skip_cleanup: true cache: cargo before_cache: # Travis can't cache files that are not readable by "others" - chmod -R a+r $HOME/.cargo -# branches: -# only: -# # release tags -# - /^\d+\.\d+\.\d+.*$/ -# - master +branches: + only: + # release tags + - /^\d+\.\d+\.\d+.*$/ + - master notifications: email: diff --git a/ci/before_deploy.sh b/ci/before_deploy.sh index 53f274008..70851042b 100755 --- a/ci/before_deploy.sh +++ b/ci/before_deploy.sh @@ -30,7 +30,6 @@ main() { # Package artifacts # Binary - ls target/$TARGET/release/ cp target/$TARGET/release/$BINARY_NAME $stage/ # Standard library cp -r zokrates_stdlib/stdlib $stage