Testing: Try to fix build error in Appveyor

spyder-ide · Oct 22, 2015 · 9966f08 · 9966f08
1 parent 274c31d
commit 9966f08
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/continuous_integration/appveyor/build_test.bat b/continuous_integration/appveyor/build_test.bat
@@ -1,8 +1,3 @@
-if not %APPVEYOR_PULL_REQUEST_NUMBER%==false (
-    set PR=%APPVEYOR_PULL_REQUEST_NUMBER%
-    git fetch origin pull/%PR%/head:appveyor_pr_%PR%
-)
-
 cd .\\continuous_integration\\conda-recipes
 
-conda build spyder
+conda build -q spyder
diff --git a/continuous_integration/conda-recipes/spyder/meta.yaml b/continuous_integration/conda-recipes/spyder/meta.yaml
@@ -7,10 +7,10 @@ build:
   osx_is_app: True
 
 source:
-  git_url: {{ environ.get('FULL_SPYDER_CLONE') }}       [unix]
   git_url: {{ environ.get('APPVEYOR_BUILD_FOLDER') }}   [win]
-  git_tag: {% if environ.get('TRAVIS_PULL_REQUEST') != 'false' %} {{ ['travis_pr_', environ.get('TRAVIS_PULL_REQUEST')]|join }} {% else %} master {% endif %}                      [unix]
-  git_tag: {% if environ.get('APPVEYOR_PULL_REQUEST_NUMBER') != 'false' %} {{ ['appveyor_pr_', environ.get('APPVEYOR_PULL_REQUEST_NUMBER')]|join }} {% else %} master {% endif %}  [win]
+  git_tag: FETCH_HEAD                                   [win]
+  git_url: {{ environ.get('FULL_SPYDER_CLONE') }}       [unix]
+  git_tag: {% if environ.get('TRAVIS_PULL_REQUEST') != 'false' %} {{ ['travis_pr_', environ.get('TRAVIS_PULL_REQUEST')]|join }} {% else %} master {% endif %}  [unix]
 
 requirements:
   build: