-
Notifications
You must be signed in to change notification settings - Fork 429
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Switch from SVN to Git for test_checkout_tool_as_dependency
- Loading branch information
1 parent
2246c17
commit 8f114a3
Showing
4 changed files
with
18 additions
and
28 deletions.
There are no files selected for viewing
10 changes: 5 additions & 5 deletions
10
tests/test-recipes/metadata/_checkout_tool_as_dependency/bld.bat
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
svn upgrade | ||
svn info | ||
:: ensure checkout worked as expected | ||
git status | ||
if errorlevel 1 exit 1 | ||
for /f "delims=" %%i in ('svn info ^| findstr "Revision"') do set svnrev=%%i | ||
|
||
:: ensure the expected commit was checked out | ||
for /f "delims=" %%i in ('git rev-parse HEAD') do if not "%%i"=="2a558a86bb77b1d21a0be77c3775464500e9dfe2" echo "exit 1" | ||
if errorlevel 1 exit 1 | ||
echo %svnrev% | ||
if not "%svnrev%"=="Revision: 1" exit 1 |
11 changes: 5 additions & 6 deletions
11
tests/test-recipes/metadata/_checkout_tool_as_dependency/build.sh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,5 @@ | ||
# Ensure the checkout went well | ||
# Think of the non-English speaking world | ||
export LC_ALL=C | ||
svn upgrade | ||
svn info | ||
[ "$(svn info | grep "Revision")" = "Revision: 1" ] | ||
# ensure checkout worked as expected | ||
git status || exit 1 | ||
|
||
# ensure the expected commit was checked out | ||
[[ "$(git rev-parse HEAD)" == "2a558a86bb77b1d21a0be77c3775464500e9dfe2" ]] |
15 changes: 5 additions & 10 deletions
15
tests/test-recipes/metadata/_checkout_tool_as_dependency/meta.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,15 @@ | ||
{% set recipe_dir = RECIPE_DIR if unix else "/" ~ RECIPE_DIR.replace("\\", "/") %} | ||
|
||
package: | ||
name: test-checkout-tool-as-dependency | ||
version: 1.0 | ||
|
||
source: | ||
svn_url: https://github.com/conda/conda_build_test_recipe.git | ||
svn_rev: 1 | ||
git_url: https://github.com/conda/conda_build_test_recipe.git | ||
git_rev: 1.0 | ||
|
||
requirements: | ||
build: | ||
# To test the conda_build version | ||
- svn | ||
- vc 9 # [win and py2k] | ||
- vc 14 # [win and py3k] | ||
# This is here so that we get a smaller host prefix to speed up | ||
# the excruciatingly slow calls to prefix_files (os.walk). | ||
- git | ||
host: | ||
# This is here so that we get a smaller host prefix to speed up | ||
# the excruciatingly slow calls to prefix_files (os.walk). | ||
- bzip2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters