Properly package artifacts for travis and appveyor

OmniSharp · Jan 16, 2016 · 8f2adec · 8f2adec
1 parent cffb8d2
commit 8f2adec
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 23 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -33,14 +33,8 @@ deploy:
   provider: releases
   api_key:
     secure: N9hansErZKHl7G5Ed/hcBgwcvLuRjB7YAskAvSAYB+luacV6rSK7Vlm/4NyjaZCwWv5wOdBphle2S4yZLRDTdMwLrdQWwWYeZI60kE22c1amKJaf6j5ai2u/P3bt55klQ2yO2U/LacwHVoRtJlVdwSAXuDQ3zMd88VbBModQyxE=
-  file:
-    - 'artifacts/omnisharp-coreclr-darwin-x64.tar.gz'
-    - 'artifacts/omnisharp-coreclr-darwin-x64.tar.gz'
-    - 'artifacts/omnisharp.boostrap-coreclr-darwin-x64.tar.gz'
-    - 'artifacts/omnisharp-coreclr-linux-x64.tar.gz'
-    - 'artifacts/omnisharp-mono.tar.gz'
-    - 'artifacts/omnisharp-coreclr-linux-x64.tar.gz'
-    - 'artifacts/omnisharp-mono.tar.gz'
+  file_glob: true
+  file: artifacts/*.tar.gz
   skip_cleanup: true
   on:
     repo: OmniSharp/omnisharp-roslyn

diff --git a/appveyor.yml b/appveyor.yml
@@ -4,11 +4,13 @@ init:
 test: off # this turns of AppVeyor automatic searching for test-assemblies, not the actual testing
 build_script:
   - build.cmd
+artifacts:
+  - path: artifacts/*.zip
 deploy:
-- provider: GitHub
-  tag: $(APPVEYOR_REPO_TAG_NAME)
-  auth_token:
-    secure: YW4vAIFrVIdyKBNxyVGWGKHP2UejoZcTcD0cf7KYEgZefUWY2XFHjetDW4Q0cICx
-  artifact: /artifact/.*\.zip/
-  on:
-    appveyor_repo_tag: true
+  - provider: GitHub
+    tag: $(APPVEYOR_REPO_TAG_NAME)
+    auth_token:
+      secure: YW4vAIFrVIdyKBNxyVGWGKHP2UejoZcTcD0cf7KYEgZefUWY2XFHjetDW4Q0cICx
+    artifact: /.*\.zip/
+    on:
+      appveyor_repo_tag: true
diff --git a/build.cmd b/build.cmd
@@ -62,7 +62,7 @@ call:_publish "OmniSharp.Bootstrap" "coreclr" "x86" "artifacts\boot-coreclr-win-
 call:_publish "OmniSharp.Bootstrap" "clr" "x64" "artifacts\boot-clr-win-x64" "..\omnisharp.bootstrap-clr-win-x64"
 :: omnisharp.bootstrap-coreclr-win-x64.zip
 call:_publish "OmniSharp.Bootstrap" "coreclr" "x64" "artifacts\boot-coreclr-win-x64" "..\omnisharp.bootstrap-coreclr-win-x64"
-:: omnisharp.boostrap.zip
+:: omnisharp.bootstrap.zip
 :::: TODO
 
 call dnvm use 1.0.0-rc2-16386 -r coreclr -arch x86

diff --git a/build.sh b/build.sh
@@ -110,19 +110,19 @@ fi
 
 if [ "$TRAVIS_OS_NAME" == "osx" ]; then
   # omnisharp-coreclr-darwin-x64.tar.gz
-  _publish "OmniSharp" "coreclr" "artifacts/build/omnisharp-coreclr" "../omnisharp-coreclr-darwin-x64"
-  # omnisharp.boostrap-coreclr-darwin-x64.tar.gz
-  _publish "OmniSharp.Bootstrap" "coreclr" "artifacts/build/omnisharp.boostrap-coreclr" "../omnisharp.boostrap-coreclr-darwin-x64"
+  _publish "OmniSharp" "coreclr" "artifacts/omnisharp-coreclr" "../omnisharp-coreclr-darwin-x64"
+  # omnisharp.bootstrap-coreclr-darwin-x64.tar.gz
+  _publish "OmniSharp.Bootstrap" "coreclr" "artifacts/omnisharp.bootstrap-coreclr" "../omnisharp.bootstrap-coreclr-darwin-x64"
 else
   # omnisharp-coreclr-linux-x64.tar.gz
-  _publish "OmniSharp" "coreclr" "artifacts/build/omnisharp-coreclr" "../omnisharp-coreclr-linux-x64"
+  _publish "OmniSharp" "coreclr" "artifacts/omnisharp-coreclr" "../omnisharp-coreclr-linux-x64"
   # omnisharp-mono.tar.gz
-  _publish "OmniSharp" "mono" "artifacts/build/omnisharp-coreclr" "../omnisharp-mono"
+  _publish "OmniSharp" "mono" "artifacts/omnisharp-coreclr" "../omnisharp-mono"
 
   # omnisharp-coreclr-linux-x64.tar.gz
-  _publish "OmniSharp.Bootstrap" "coreclr" "artifacts/build/omnisharp.boostrap-coreclr" "../omnisharp.boostrap-coreclr-linux-x64"
+  _publish "OmniSharp.Bootstrap" "coreclr" "artifacts/omnisharp.bootstrap-coreclr" "../omnisharp.bootstrap-coreclr-linux-x64"
   # omnisharp-mono.tar.gz
-  _publish "OmniSharp.Bootstrap" "mono" "artifacts/build/omnisharp.boostrap-coreclr" "../omnisharp.boostrap-mono"
+  _publish "OmniSharp.Bootstrap" "mono" "artifacts/omnisharp.bootstrap-coreclr" "../omnisharp.bootstrap-mono"
 
   if [ $TRAVIS ]; then
     _patch_project "OmniSharp.Host"