Browse Source

fix source directory path for appveyor

merge-requests/365/head
Jørgen Lien Sellæg 10 years ago
parent
commit
1ec36f44bc
  1. 6
      appveyor.yml
  2. 7
      ci/execute.sh

6
appveyor.yml

@ -8,8 +8,8 @@ before_build:
- C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh pacman - C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh pacman
- C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh git - C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh git
- C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh --sysupgrade --sysupgrade - C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh --sysupgrade --sysupgrade
- C:\msys64\usr\bin\bash -lc "C:/projects/jucipp/ci/update_ci.sh" - C:\msys64\usr\bin\bash -lc "$(cygpath ${APPVEYOR_BUILD_FOLDER})/ci/update_ci.sh"
build_script: build_script:
- C:\msys64\usr\bin\bash -lc "script=compile C:/projects/jucipp/ci/execute.sh" - C:\msys64\usr\bin\bash -lc "script=compile $(cygpath ${APPVEYOR_BUILD_FOLDER})/ci/execute.sh"
- C:\msys64\usr\bin\bash -lc "script=compile make_command='CTEST_OUTPUT_ON_FAILURE=1 make test' C:/projects/jucipp/ci/execute.sh" - C:\msys64\usr\bin\bash -lc "script=compile make_command='CTEST_OUTPUT_ON_FAILURE=1 make test' $(cygpath ${APPVEYOR_BUILD_FOLDER})/ci/execute.sh"

7
ci/execute.sh

@ -29,12 +29,13 @@ function osx () {
function windows () { function windows () {
export PATH="/mingw64/bin:/usr/local/bin:/usr/bin:/bin:/c/WINDOWS/system32:/c/WINDOWS:/c/WINDOWS/System32/Wbem:/c/WINDOWS/System32/WindowsPowerShell/v1.0:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl" export PATH="/mingw64/bin:/usr/local/bin:/usr/bin:/bin:/c/WINDOWS/system32:/c/WINDOWS:/c/WINDOWS/System32/Wbem:/c/WINDOWS/System32/WindowsPowerShell/v1.0:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl"
cd "C:/projects" || (echo "Error changing directory"; return 1) bf=$(cygpath ${APPVEYOR_BUILD_FOLDER})
cd "$bf" || (echo "Error changing directory"; return 1)
if [ "${script}" == "clean" ]; then if [ "${script}" == "clean" ]; then
sudo rm "C:/projects/jucipp/build" -rf sudo rm "./build" -rf
return 0 return 0
fi fi
sh -c "C:/projects/jucipp/ci/${script}.sh" sh -c "${bf}/ci/${script}.sh"
} }

Loading…
Cancel
Save