Skip to content
This repository was archived by the owner on Jun 25, 2020. It is now read-only.

Commit 1ec36f4

Browse files
committed
fix source directory path for appveyor
1 parent 2a86c1c commit 1ec36f4

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

appveyor.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ before_build:
88
- C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh pacman
99
- C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh git
1010
- C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh --sysupgrade --sysupgrade
11-
- C:\msys64\usr\bin\bash -lc "C:/projects/jucipp/ci/update_ci.sh"
11+
- C:\msys64\usr\bin\bash -lc "$(cygpath ${APPVEYOR_BUILD_FOLDER})/ci/update_ci.sh"
1212

1313
build_script:
14-
- C:\msys64\usr\bin\bash -lc "script=compile C:/projects/jucipp/ci/execute.sh"
15-
- C:\msys64\usr\bin\bash -lc "script=compile make_command='CTEST_OUTPUT_ON_FAILURE=1 make test' C:/projects/jucipp/ci/execute.sh"
14+
- C:\msys64\usr\bin\bash -lc "script=compile $(cygpath ${APPVEYOR_BUILD_FOLDER})/ci/execute.sh"
15+
- C:\msys64\usr\bin\bash -lc "script=compile make_command='CTEST_OUTPUT_ON_FAILURE=1 make test' $(cygpath ${APPVEYOR_BUILD_FOLDER})/ci/execute.sh"

ci/execute.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,13 @@ function osx () {
2929

3030
function windows () {
3131
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"
32-
cd "C:/projects" || (echo "Error changing directory"; return 1)
32+
bf=$(cygpath ${APPVEYOR_BUILD_FOLDER})
33+
cd "$bf" || (echo "Error changing directory"; return 1)
3334
if [ "${script}" == "clean" ]; then
34-
sudo rm "C:/projects/jucipp/build" -rf
35+
sudo rm "./build" -rf
3536
return 0
3637
fi
37-
sh -c "C:/projects/jucipp/ci/${script}.sh"
38+
sh -c "${bf}/ci/${script}.sh"
3839
}
3940

4041

0 commit comments

Comments
 (0)