From 484b2f788a5c5cbf14f6d53b35d0d693eb01ec8a Mon Sep 17 00:00:00 2001 From: Peter Badida Date: Sat, 13 May 2017 22:52:55 +0200 Subject: [PATCH] Upload wheels directly to server (#5175) * add server key for appveyor * Add rsync wheel uploading * Path fix * Correct env var * Convert path * Fix path * Split options * Try list folders * Bad quotes * TOP SECRET * Update appveyor.yml * Update appveyor.yml * Update appveyor.yml * Update * Fix option * mkdir beforehand * Update kivy-upload.sh * Update appveyor.yml * Update kivy-upload.sh * Abs path * Update kivy-upload.sh * Stop dry run * do_wheels false by default --- appveyor.yml | 21 ++++++++++----------- kivy/tools/appveyor/id_rsa.enc | Bin 0 -> 3248 bytes kivy/tools/appveyor/kivy-upload.sh | 7 +++++++ 3 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 kivy/tools/appveyor/id_rsa.enc create mode 100644 kivy/tools/appveyor/kivy-upload.sh diff --git a/appveyor.yml b/appveyor.yml index 557228aa8..82dc87231 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,17 +3,15 @@ os: Visual Studio 2015 environment: WHEEL_DIR: C:\kivy_wheels KIVY_BUILD_DIR: C:\kivy_build - AIRPLANE_CHARGE: - secure: HgQr7XMKpB6lWn33SKv0GyYZbh1RfpgvaIKEE0B54R5XHJujQg5dhOEB3Vc2CfAqCprX+CGxXAjQwFnuv6pJeA3++9Z8/1SfFuEqCF59J7PqsDs2thA8lNHLRsThvRVJrBt2jcb1wrG3Nf3sz3vi7e+rBzYjprkcYiTP0XJ5FdQekyFTTjuXYaRBGWrwGX81dEVVUkGFuEZFYWJq2Yf/PkFGOX+IN0CjgpFB0pGfZSJcIG7mvscurfG/KvckLhNUINprUKt0pJ8iCN0iufsbmrOnuG+WC8AHktvlSxzHSfCm8zmhSZTkDNkJfpYHapFagQQThmiYq8PqsVIC0XOz+j4KLljc6bxyhE0oPtOPg4DohBdqLI28V1XB/Kqh7CCZR50wAw567voWVOtKsyets5oeywZH1q/gtK6stC5t7v+a2s0w1I2IEW6p2aPy7plreZj15QCgIR8h6JgIuMuwqiaVCUuhej/GauCZG/9jIBJpTf1NkBa9k4vIxHPq5R5/ltYX8za49vz5ImdLe1qlTFwy9fegMpb+D5m3y3ilm+t5xkDmqXQau1oVWIVd8jf0DawWqkNsKLp6hbYr51gclS+Gc7NVKwvFtcmoAfbvNCGBDH4vF6cR2wNhy6RDjjqDgIStnpUs3fKS9bKOyrv9+394esQqEuAXgLtC2vUMk+z3Hf8V18AFYKZfZmWxiGGrjI6YQCBOBOdh5VO5cASqtoTU22OvAPhXT7gX2JG96Rc9yf/K8DEvzuWo3lArDAclh2zLm++1SOh54dDiAiMZvLkNXu5tAsg60c+rJCx4FQ9ra0/GcFY1LKJntdKvpQyBkp4wKAvq3YyV7Rnx8u6PULXXG2rS6i7m+asLrY+FSCO5oRmLrMv5pEv0cF/BOAh0RGR6medX8ASmM40sHqz+WC9WJfaSUZplSzQwHxXCr/AzK40mOTtKgkg8e8tqwNzjI8mdjx0kwcu8zuOeUK6U6l83voGKbli1gzinkLvzhjvF1TXZwpT1y/HvAs5dGwXVfdigeOqcfmIOxXStPmaZ4CZRKVK3CgweYzpETyT6Pm5H3jANcAuyYuphJr7YrfHfWKAg6N3Q0r3AfzliOuIBm3DVfm2RuI8USGJxRsjaDX8LB8sdhrCPLUYBh1RNhYol5bVEM1IX+BcpXzIyqv00eSMTvN3G7KdsM+/8LGlnEM+apIgnBlVfcWOQI8rzBkXuJvExSwDhKzncGWbi12UapEVsE/QnVpDiwbiPdZtQQzQ= - GDRIVE_CLIENT_ID: - secure: iGAZpJPOTLhRmK7X60xzRZm1S0PbmoMwoVJdd8WiKBH34Tqsd6UEFhPjLLok7J0+xWStS8E3fwEQh4Wzn1BCXhry5Qv8FLD41oskVpiSwdc= - GDRIVE_CLIENT_SECRET: - secure: 7J8TZnhr3MsF5rveMVVkbrr9tzTwGG6rHWZMorW0WN4= - GDRIVE_KIVY_UPLOAD_ID: 0B1_HB9J8mZepOV81UHpDbmg5SWM + DO_WHEEL: False + KEY_WITH_NO_TEETH: + secure: 7cS7xjpCL/VH5jIIGSf13camkiu1enMh5hO0UsBgmRlBXyKk3t/7HB79ofyJKgDb USE_SDL2: 1 USE_GSTREAMER: 1 KIVY_USE_SETUPTOOLS: 1 KIVY_SPLIT_EXAMPLES: 1 + MSYSTEM: MINGW64 + CHERE_INVOKING: 1 matrix: - PYVER: 27 BITTNESS: 86 @@ -42,6 +40,7 @@ environment: install: - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-desktop.ps1')) build_script: +- nuget install secure-file -ExcludeVersion - ps: >- function Check-Error @@ -52,7 +51,6 @@ build_script: } } - echo "Bitness=$env:BITTNESS, scheduled=$env:APPVEYOR_SCHEDULED_BUILD, forced=$env:APPVEYOR_FORCED_BUILD, rebuild=$env:APPVEYOR_RE_BUILD, tagged=$env:APPVEYOR_REPO_TAG" @@ -123,7 +121,7 @@ build_script: } - $DO_WHEEL = "True" + $DO_WHEEL = $env:DO_WHEEL # Set new wheel name, keep default if release (tag) # release: Kivy-X.Y.Z-cpAB-cpABm-ARCH.whl (Kivy_examples-X.Y.Z-py2.py3-none-any.whl) @@ -196,11 +194,12 @@ build_script: Check-Error } - C:\Python27\python.exe C:\projects\kivy-sdk-packager\win\gdrive.py upload "$env:GDRIVE_KIVY_UPLOAD_ID" "$env:WHEEL_DIR\*" + secure-file\tools\secure-file -decrypt C:\projects\kivy\kivy\tools\appveyor\id_rsa.enc -secret "$env:KEY_WITH_NO_TEETH" Check-Error - C:\Python27\python.exe C:\projects\kivy-sdk-packager\win\gdrive.py delete_older "$env:GDRIVE_KIVY_UPLOAD_ID" "15" + C:\msys64\usr\bin\bash --login C:\projects\kivy\kivy\tools\appveyor\kivy-upload.sh Check-Error + } test_script: - ps: >- diff --git a/kivy/tools/appveyor/id_rsa.enc b/kivy/tools/appveyor/id_rsa.enc new file mode 100644 index 0000000000000000000000000000000000000000..ea990da18df0243e52f87a1300ee35915faa9f1a GIT binary patch literal 3248 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 iNAuP@fb5p|7*> ~/.ssh/config +cp $(cygpath -u "C:\projects\kivy\kivy\tools\appveyor\id_rsa") ~/.ssh/id_rsa +rsync -avh -e "ssh -p 2458" "/c/kivy_wheels/" root@159.203.106.198:/web/downloads/appveyor/kivy