mirror of
https://github.com/OpenMW/openmw.git
synced 2025-06-21 22:11:33 +00:00
Ditch old AppVeyor stuff
We've not used AppVeyor for years. If we started again, it'd use a different version of Boost and that aspect would need redoing anyway. Everything else that was AppVeyor-specific is something we've got away without in GitLab CI so can't have been especially important.
This commit is contained in:
parent
830a26f75e
commit
0e2119c638
1 changed files with 3 additions and 19 deletions
|
@ -44,7 +44,6 @@ function unixPathAsWindows {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
APPVEYOR=${APPVEYOR:-}
|
|
||||||
CI=${CI:-}
|
CI=${CI:-}
|
||||||
STEP=${STEP:-}
|
STEP=${STEP:-}
|
||||||
|
|
||||||
|
@ -206,16 +205,8 @@ if [ -z $VERBOSE ]; then
|
||||||
STRIP="> /dev/null 2>&1"
|
STRIP="> /dev/null 2>&1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z $APPVEYOR ]; then
|
DIR=$(windowsPathAsUnix "${BASH_SOURCE[0]}")
|
||||||
echo "Running prebuild outside of Appveyor."
|
cd $(dirname "$DIR")/..
|
||||||
|
|
||||||
DIR=$(windowsPathAsUnix "${BASH_SOURCE[0]}")
|
|
||||||
cd $(dirname "$DIR")/..
|
|
||||||
else
|
|
||||||
echo "Running prebuild in Appveyor."
|
|
||||||
|
|
||||||
cd "$APPVEYOR_BUILD_FOLDER"
|
|
||||||
fi
|
|
||||||
|
|
||||||
run_cmd() {
|
run_cmd() {
|
||||||
CMD="$1"
|
CMD="$1"
|
||||||
|
@ -226,13 +217,7 @@ run_cmd() {
|
||||||
eval $CMD $@ > output.log 2>&1 || RET=$?
|
eval $CMD $@ > output.log 2>&1 || RET=$?
|
||||||
|
|
||||||
if [ $RET -ne 0 ]; then
|
if [ $RET -ne 0 ]; then
|
||||||
if [ -z $APPVEYOR ]; then
|
|
||||||
echo "Command $CMD failed, output can be found in $(real_pwd)/output.log"
|
echo "Command $CMD failed, output can be found in $(real_pwd)/output.log"
|
||||||
else
|
|
||||||
echo
|
|
||||||
echo "Command $CMD failed;"
|
|
||||||
cat output.log
|
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
rm output.log
|
rm output.log
|
||||||
fi
|
fi
|
||||||
|
@ -559,7 +544,6 @@ echo "Starting prebuild on MSVC${MSVC_DISPLAY_YEAR} WIN${BITS}"
|
||||||
echo "==================================="
|
echo "==================================="
|
||||||
echo
|
echo
|
||||||
|
|
||||||
# cd OpenMW/AppVeyor-test
|
|
||||||
mkdir -p deps
|
mkdir -p deps
|
||||||
cd deps
|
cd deps
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue