From 959d7994825bec09bd1daedb240e3a900d3e1b95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A4r=20Winzell?= Date: Tue, 14 May 2019 22:09:11 -0700 Subject: [PATCH 1/6] Try AppVeyor auto-upload release builds. --- appveyor.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index eaf1665..3ae902a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -31,8 +31,20 @@ build_script: - cmd: conan build -bf build . - cmd: move build\Release\FBX2glTF.exe build\Release\FBX2glTF-windows-x64.exe +test: off + artifacts: - path: build/Release/FBX2glTF-windows-x64.exe -test: off -deploy: off +deploy: + tag: $(APPVEYOR_REPO_TAG_NAME) + description: '' + provider: GitHub + auth_token: + secure: RnycxjEjIgpRKZ6l09OX869trx2jNX0B10wrfjt3wul2sSJfbG4ZeHJSbqtPpqQt + artifact: build/Release/FBX2glTF-windows-x64.exe + draft: true + prerelease: true + on: +# branch: master # release from master branch only + APPVEYOR_REPO_TAG: true # deploy on tag push only From 07c69ce0e79de243a0c3bbbae93b5d17e7e63fdc Mon Sep 17 00:00:00 2001 From: Par Winzell Date: Thu, 16 May 2019 10:32:41 -0700 Subject: [PATCH 2/6] Don't skip tags, whitelist test branch. --- appveyor.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 3ae902a..86b1cbc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,9 +4,7 @@ version: 1.0.{build} branches: only: - master - - feat/appveyor-build - -skip_tags: true + - feat/appveyor-artifacts environment: matrix: From b8b470395b6c14d51e6171b0b32f28f061f372dc Mon Sep 17 00:00:00 2001 From: Par Winzell Date: Thu, 16 May 2019 10:58:56 -0700 Subject: [PATCH 3/6] Build all branches, cache Conan downloads. --- appveyor.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 86b1cbc..2d7bd8a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,11 +1,6 @@ # version format version: 1.0.{build} -branches: - only: - - master - - feat/appveyor-artifacts - environment: matrix: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 @@ -14,6 +9,9 @@ environment: stack: python %PYTHON% +cache: + - C:\Users\appveyor\.conan\data -> appveyor.yml + install: - cmd: echo "Downloading conan..." - cmd: set PATH=%PYTHON%;%PYTHON%\Scripts;%PATH% From 8f51ee40163162e307484fb2b2cd81cd5446b2f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A4r=20Winzell?= Date: Wed, 15 May 2019 00:33:41 -0700 Subject: [PATCH 4/6] Conan doesn't like adding remotes twice. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1efb722..9387a93 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ install: - conda activate travis_env - pip install conan - conan user -- conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan +- conan remote add --force bincrafters https://api.bintray.com/conan/bincrafters/public-conan before_script: - git lfs pull From 75f811491cd81d73fedf52c7be4bb15da1808324 Mon Sep 17 00:00:00 2001 From: Par Winzell Date: Thu, 16 May 2019 11:59:16 -0700 Subject: [PATCH 5/6] auth token encrypted against FB acct --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 2d7bd8a..94c0f15 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -37,7 +37,7 @@ deploy: description: '' provider: GitHub auth_token: - secure: RnycxjEjIgpRKZ6l09OX869trx2jNX0B10wrfjt3wul2sSJfbG4ZeHJSbqtPpqQt + secure: OSvhQP0O9uaH+OFOJpbGiiBMRTOJ+H/VJHqVBhq39RNDnOfUEr/yjJNKh3JSdNqj artifact: build/Release/FBX2glTF-windows-x64.exe draft: true prerelease: true From 7683d208cbe9c901756e8554298867f6767fc7ac Mon Sep 17 00:00:00 2001 From: Par Winzell Date: Thu, 16 May 2019 12:39:08 -0700 Subject: [PATCH 6/6] Prepare for merge with master. --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 94c0f15..a5d851c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -42,5 +42,5 @@ deploy: draft: true prerelease: true on: -# branch: master # release from master branch only - APPVEYOR_REPO_TAG: true # deploy on tag push only + branch: master + APPVEYOR_REPO_TAG: true