Skip to content

Commit 984c4df

Browse files
authored
Merge pull request #34 from hapi-server/travis
Travis windows
2 parents 25da6f9 + 4469b5b commit 984c4df

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

.travis.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ language: bash
33
os:
44
- linux
55
- osx
6-
# - windows
6+
- windows
77

88
script:
9-
# - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install make; fi
10-
# - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install -y miniconda3; fi
11-
# - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install -y anaconda3; fi
9+
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install make; fi
10+
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install -y miniconda3; fi
1211
- make repository-test-data-all

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ CONDA=./anaconda3
2020

2121
# ifeq ($(shell uname -s),MINGW64_NT-10.0-18362)
2222
ifeq ($(TRAVIS_OS_NAME),windows)
23-
# CONDA=/c/tools/anaconda3
23+
# CONDA=/c/tools/anaconda3
2424
CONDA=/c/tools/miniconda3
2525
endif
2626

-1.72 KB
Binary file not shown.

0 commit comments

Comments
 (0)