From 7b2af03a430a2189035efbc1578dcdcb77395445 Mon Sep 17 00:00:00 2001 From: Brian Heim Date: Tue, 31 Mar 2020 22:03:56 -0500 Subject: [PATCH 1/3] Appveyor: add workaround for storage limit it seems like it might take appveyor some time to address this, so in the meantime i am going to try to manually push to S3 (and disable github release deployment altogether) using --dry-run right now so even success will not actually upload any artefacts --- .appveyor.yml | 77 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 32 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index dba4b7585da..6867bbcd30d 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -18,6 +18,12 @@ environment: CMAKE_CONFIGURATION: Release ASIO_URL: "http://www.steinberg.net/sdk_downloads/asiosdk2.3.zip" ASIO_ZIP: asiosdk2.3.zip + # XXX vvv TEMPORARY WORKAROUND DUE TO APPVEYOR ARTIFACT STORAGE LIMIT + AWS_ACCESS_KEY_ID: + secure: cUwCIb/EtpG3uAP48WylcMNxAh3yEbPNcQGPZDnh6go= + AWS_SECRET_ACCESS_KEY: + secure: 9n0lOPh/3hpwSEf1l0QySYngrgWYqplZozQ9ZJMxtDARIV5DIBn/NXttTfkh1Z3k + # XXX ^^^ TEMPORARY WORKAROUND DUE TO APPVEYOR ARTIFACT STORAGE LIMIT matrix: - QT_DIR: "C:/Qt/5.9/msvc2015" @@ -119,38 +125,45 @@ after_build: } - ps: cd .. +# XXX vvv TEMPORARY WORKAROUND DUE TO APPVEYOR ARTIFACT STORAGE LIMIT +- echo "Pushing artifact to S3" +- ps: aws s3 cp --region us-west-2 --recursive --include "*" $env:APPVEYOR_BUILD_FOLDER/artifacts/ s3://supercollider/$env:S3_BUILDS_LOCATION +# XXX ^^^ TEMPORARY WORKAROUND DUE TO APPVEYOR ARTIFACT STORAGE LIMIT + after_deploy: - ps: echo "S3 Build Location = $env:S3_URL" -artifacts: - - path: artifacts - name: art_folder - - path: build\Install\*.exe - name: installer - type: File - -deploy: -# s3 upload - every commit -- provider: S3 - access_key_id: - secure: cUwCIb/EtpG3uAP48WylcMNxAh3yEbPNcQGPZDnh6go= - secret_access_key: - secure: 9n0lOPh/3hpwSEf1l0QySYngrgWYqplZozQ9ZJMxtDARIV5DIBn/NXttTfkh1Z3k - bucket: supercollider - region: us-west-2 - folder: $(S3_BUILDS_LOCATION) - artifact: art_folder - unzip: true - set_public: true - on: - appveyor_repo_name: supercollider/supercollider - -# github releases - only tags -- provider: GitHub - description: appveyor_$(APPVEYOR_REPO_TAG_NAME) - artifact: installer - auth_token: - secure: 6m5+IiGj/pLhiUJvZPqs7yOlSe0ttH3pklaM7w1i8ca4YRUrIKddsGTZAZo86qLx - prerelease: true - on: - appveyor_repo_tag: true +# XXX vvv TEMPORARILY DISABLED DUE TO APPVEYOR ARTIFACT STORAGE LIMIT +#artifacts: +# - path: artifacts +# name: art_folder +# - path: build\Install\*.exe +# name: installer +# type: File +# +#deploy: +## s3 upload - every commit +#- provider: S3 +# access_key_id: +# secure: cUwCIb/EtpG3uAP48WylcMNxAh3yEbPNcQGPZDnh6go= +# secret_access_key: +# secure: 9n0lOPh/3hpwSEf1l0QySYngrgWYqplZozQ9ZJMxtDARIV5DIBn/NXttTfkh1Z3k +# bucket: supercollider +# region: us-west-2 +# folder: $(S3_BUILDS_LOCATION) +# artifact: art_folder +# unzip: true +# set_public: true +# on: +# appveyor_repo_name: supercollider/supercollider +# +## github releases - only tags +#- provider: GitHub +# description: appveyor_$(APPVEYOR_REPO_TAG_NAME) +# artifact: installer +# auth_token: +# secure: 6m5+IiGj/pLhiUJvZPqs7yOlSe0ttH3pklaM7w1i8ca4YRUrIKddsGTZAZo86qLx +# prerelease: true +# on: +# appveyor_repo_tag: true +# XXX ^^^ TEMPORARY WORKAROUND DUE TO APPVEYOR ARTIFACT STORAGE LIMIT From e1ce43fc76a7225927a45f48d31822c597e80ad3 Mon Sep 17 00:00:00 2001 From: Brian Heim Date: Thu, 2 Apr 2020 21:07:15 -0500 Subject: [PATCH 2/3] appveyor: make aws push conditional on repo name --- .appveyor.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 6867bbcd30d..b6de3dc8d80 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -126,8 +126,11 @@ after_build: - ps: cd .. # XXX vvv TEMPORARY WORKAROUND DUE TO APPVEYOR ARTIFACT STORAGE LIMIT -- echo "Pushing artifact to S3" -- ps: aws s3 cp --region us-west-2 --recursive --include "*" $env:APPVEYOR_BUILD_FOLDER/artifacts/ s3://supercollider/$env:S3_BUILDS_LOCATION +- ps: >- + If ($env:APPVEYOR_REPO_NAME -eq "supercollider/supercollider") { + echo "Pushing artifact to S3" + aws s3 cp --region us-west-2 --recursive --include "*" $env:APPVEYOR_BUILD_FOLDER/artifacts/ s3://supercollider/$env:S3_BUILDS_LOCATION + } # XXX ^^^ TEMPORARY WORKAROUND DUE TO APPVEYOR ARTIFACT STORAGE LIMIT after_deploy: From 232b286804fa83aa6e106383c7bf7a226d7678ac Mon Sep 17 00:00:00 2001 From: Brian Heim Date: Thu, 2 Apr 2020 21:26:05 -0500 Subject: [PATCH 3/3] appveyor: fix echoing build location --- .appveyor.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index b6de3dc8d80..a5be16711b2 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -130,13 +130,15 @@ after_build: If ($env:APPVEYOR_REPO_NAME -eq "supercollider/supercollider") { echo "Pushing artifact to S3" aws s3 cp --region us-west-2 --recursive --include "*" $env:APPVEYOR_BUILD_FOLDER/artifacts/ s3://supercollider/$env:S3_BUILDS_LOCATION + echo "S3 Build Location = $env:S3_URL" } # XXX ^^^ TEMPORARY WORKAROUND DUE TO APPVEYOR ARTIFACT STORAGE LIMIT -after_deploy: -- ps: echo "S3 Build Location = $env:S3_URL" # XXX vvv TEMPORARILY DISABLED DUE TO APPVEYOR ARTIFACT STORAGE LIMIT +#after_deploy: +#- ps: echo "S3 Build Location = $env:S3_URL" +# #artifacts: # - path: artifacts # name: art_folder