diff --git a/.travis.yml b/.travis.yml index 67a25143c..725bd9abe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,6 +42,7 @@ env: - secure: Qk+gzBLwjrB8abUYzxap10dYSpIeKpB1gqhdoMbqS23G0r1lejnsjutIfReuJGK/efCmhisKN1xIX/InvJWD8z6GsLJFmf3F0oRj7aDJ/X5UIn9Upflje9xgHQafP1FJuzZBWtzandNfPE8EmEOgAQsJZ3c7xBE1SY/6xcJaQTc= - secure: m4+k3/QcYvqmMoRO8uq3ef2jAO1FWeRVDG/XtlbjBlgmB5OR/zW5c7c1Ywm6IM5yzsi1rRks8GFffZ6gYqXhML10EfGKVbnyBcZZ7HVylNtvxDF68W1BLacChzDs4mGYQSV8kJRGI3EaVNdyFJ5yln/HUZ6qBbQ473MtxprO6BI= - secure: GEyUuLuIc7D3F4noKhtTCbWbQAlm61Y7Vh2mOKBEgmyfoV1johwlEL0RaeRyr9MnU2MN+4jeFthvDjxm3LGP19zrpB46GTGHU6/H9BZBodDCJsFTqj32T+5QTcAF2RQ66ZgYpSyTf063/RLlfy7YjCb8KLiJ2asCaoYtQIjx3hA= + - secure: LvO6/hNrhZo/4GCy4QoXV4V1UucnSt1upKg5K5LF0KgVOrAENYny0zdOJZgT5f6rTWLTU4WlY9ZXzipEhsyBMeWF8SH2LmDYvqHj5gTb3ANNgvvgVyutwq2XqnMTTrJy38CJaoLHHAF4uxkKr22omjSNzHKntAis95VjnIXLxug= jobs: include: diff --git a/appveyor.yml b/appveyor.yml index b23dd8eb7..89b65ba42 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,7 @@ version: ci.{build} image: Visual Studio 2019 clone_depth: 1 +skip_tags: true environment: GC_GOOGLE_CALENDAR_CLIENT_SECRET: @@ -213,18 +214,16 @@ artifacts: name: GCversionWindows deploy: -# deploy continuous builds to s3 - - provider: S3 - access_key_id: - secure: RoEkfKfOnF7JHOiLZX5qfZM08X+bu4oaDzzSKgdooNM= - secret_access_key: - secure: GPAArawatirYwgpHJBthdrbvyFU5bBzPOdK7VYYPiG2YHYi/DNJZ5Q5qGK1A440p - bucket: goldencheetah-binaries - region: us-east-1 - remove_files: true - set_public: true - folder: Windows +# deploy continuous builds to GitHub release + - provider: GitHub + auth_token: + secure: 807DE/9vib/Kjz5Tah/Zc6zkoigLEWRzASw/DUWjLwZ5d8HHomXqWQ7iln4VtOqL + release: snapshot + description: 'Snapshot Builds' artifact: GCinstaller, GCversionWindows + draft: false + prerelease: false + force_update: true on: PUBLISH_BINARIES: true APPVEYOR_REPO_NAME: "GoldenCheetah/GoldenCheetah" diff --git a/travis/linux/after_success.sh b/travis/linux/after_success.sh index 341acd503..8d3f3cdf7 100755 --- a/travis/linux/after_success.sh +++ b/travis/linux/after_success.sh @@ -94,9 +94,10 @@ cat GCversionLinux.txt ### upload for testing if [[ $TRAVIS_PULL_REQUEST == "false" && $TRAVIS_COMMIT_MESSAGE == *"[publish binaries]"* ]]; then -aws s3 rm s3://goldencheetah-binaries/Linux --recursive # keep only the last one -aws s3 cp --acl public-read $FINAL_NAME s3://goldencheetah-binaries/Linux/$FINAL_NAME -aws s3 cp --acl public-read GCversionLinux.txt s3://goldencheetah-binaries/Linux/GCversionLinux.txt +mkdir out +mv $FINAL_NAME out +mv GCversionLinux.txt out +~/go/bin/ghr snapshot out else curl --max-time 300 -F "file=@$FINAL_NAME" https://temp.sh/upload fi diff --git a/travis/linux/before_install.sh b/travis/linux/before_install.sh index b1f077e5e..2af45c064 100755 --- a/travis/linux/before_install.sh +++ b/travis/linux/before_install.sh @@ -57,10 +57,7 @@ cd ${TRAVIS_BUILD_DIR} # GSL sudo apt-get -qq install libgsl-dev -# AWS S3 client to upload binaries -curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" -unzip -qq awscliv2.zip -sudo ./aws/install -aws --version +# GHR to upload binaries to GitHub releases +go install github.com/tcnksm/ghr@latest exit diff --git a/travis/osx/after_success.sh b/travis/osx/after_success.sh index bb375d2ae..f4ab1c453 100755 --- a/travis/osx/after_success.sh +++ b/travis/osx/after_success.sh @@ -67,9 +67,10 @@ cat GCversionMacOS.txt echo "Uploading for user tests" ### upload for testing if [[ $TRAVIS_PULL_REQUEST == "false" && $TRAVIS_COMMIT_MESSAGE == *"[publish binaries]"* ]]; then -aws s3 rm s3://goldencheetah-binaries/MacOS --recursive # keep only the last one -aws s3 cp --acl public-read $FINAL_NAME s3://goldencheetah-binaries/MacOS/$FINAL_NAME -aws s3 cp --acl public-read GCversionMacOS.txt s3://goldencheetah-binaries/MacOS/GCversionMacOS.txt +mkdir out +mv $FINAL_NAME out +mv GCversionMacOS.txt out +ghr snapshot out else curl --max-time 300 -F "file=@$FINAL_NAME" https://temp.sh/upload fi diff --git a/travis/osx/before_install.sh b/travis/osx/before_install.sh index e1ec87f98..b4809b0e2 100755 --- a/travis/osx/before_install.sh +++ b/travis/osx/before_install.sh @@ -52,9 +52,7 @@ if [[ -z "$(ls -A VLC)" ]]; then fi sudo cp VLC/lib/libvlc*.dylib /usr/local/lib -# AWS client to upload binaries to S3 bucket -curl -O https://awscli.amazonaws.com/AWSCLIV2.pkg -sudo installer -pkg AWSCLIV2.pkg -target / -aws --version +# GHR to updload binaries to GitHub releases +brew install ghr exit