diff options
| author | TitanSnow <[email protected]> | 2017-03-30 13:43:45 +0800 |
|---|---|---|
| committer | TitanSnow <[email protected]> | 2017-03-30 13:43:45 +0800 |
| commit | 076c032e555ed8ea792d0e132836fe9fb6ffc8bc (patch) | |
| tree | 8842817a73e8d75e93ef24ade1922881e9ccb8b3 | |
| parent | a2776206f51716c47817caf99252936b9c0a9953 (diff) | |
| parent | 352ce0133a96432e52eac12cb3ebe7fb6a8cb675 (diff) | |
Merge branch 'self_build' into makefile
| -rw-r--r-- | .travis.yml | 18 | ||||
| -rw-r--r-- | appveyor.yml | 10 |
2 files changed, 13 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml index 0b2df0bb0..0df1414a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,18 +4,20 @@ os: - linux - osx -branches: - only: - - master - - dev - install: + - cd .. + - cp -r xmake xmake4build + - cd xmake4build - sudo ./install - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update --verbose; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install dmd --verbose; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install rust --verbose; fi script: - - xmake create -P ./test - - xmake -P ./test - - ./tests/tests + - cd ../xmake/core + - xmake -v + - sudo cp -v build/xmake /usr/local/share/xmake + - xmake --version + - xmake create test_project + - cd test_project + - xmake diff --git a/appveyor.yml b/appveyor.yml index b8a88d8b5..51b27fb35 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,10 +14,6 @@ before_build: - cmd: dir C:\xmake build_script: - - cmd: cd tests\console_c - - cmd: if %platform%==Win32 xmake f -m debug - - cmd: if %platform%==Win64 xmake f -m debug -a x64 - - cmd: xmake - -test_script: - - cmd: xmake --version + - cmd: cd core + - cmd: if %platform%==Win64 xmake f -a x64 + - cmd: xmake -v |