From 5dad3bb8af9dcd634e77d6af18c4b9d55c190c9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 10 Dec 2020 15:35:31 +0100 Subject: [PATCH] package/ci: note to self: don't use CIRCLE_WORKING_DIRECTORY ever again. --- package/ci/unix-desktop-gles.sh | 9 ++++++--- package/ci/unix-desktop.sh | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/package/ci/unix-desktop-gles.sh b/package/ci/unix-desktop-gles.sh index 514c92c..aa5b9a5 100755 --- a/package/ci/unix-desktop-gles.sh +++ b/package/ci/unix-desktop-gles.sh @@ -79,9 +79,10 @@ ninja $NINJA_JOBS CORRADE_TEST_COLOR=ON ctest -V -# Verify the setuptools install +# Verify the setuptools install. Not using $CIRCLE_WORKING_DIRECTORY because +# it's ~ and that's not correctly expanded always. cd src/python -python3 setup.py install --root="$CIRCLE_WORKING_DIRECTORY/install" --prefix=/usr +python3 setup.py install --root="$(pwd)/../../install" --prefix=/usr # Run tests & gather coverage cd ../../../src/python/corrade @@ -94,4 +95,6 @@ cp .coverage ../.coverage.magnum # Test docstring validity cd ../../../doc/python -PYTHONPATH="$CIRCLE_WORKING_DIRECTORY/build/src/python" python3 -m doctest -v *.rst +# I would use $CIRCLE_WORKING_DIRECTORY, but that's ~ and that's not expanded +# here for some reason +PYTHONPATH="$(pwd)/../../build/src/python" python3 -m doctest -v *.rst diff --git a/package/ci/unix-desktop.sh b/package/ci/unix-desktop.sh index 0ca9315..7f554f6 100755 --- a/package/ci/unix-desktop.sh +++ b/package/ci/unix-desktop.sh @@ -85,9 +85,10 @@ ninja $NINJA_JOBS CORRADE_TEST_COLOR=ON ctest -V -# Verify the setuptools install +# Verify the setuptools install. Not using $CIRCLE_WORKING_DIRECTORY because +# it's ~ and that's not correctly expanded always. cd src/python -python3 setup.py install --root="$CIRCLE_WORKING_DIRECTORY/install" --prefix=/usr +python3 setup.py install --root="$(pwd)/../../install" --prefix=/usr # Run tests & gather coverage cd ../../../src/python/corrade @@ -100,4 +101,6 @@ cp .coverage ../.coverage.magnum # Test docstring validity cd ../../../doc/python -PYTHONPATH="$CIRCLE_WORKING_DIRECTORY/build/src/python" python3 -m doctest -v *.rst +# I would use $CIRCLE_WORKING_DIRECTORY, but that's ~ and that's not expanded +# here for some reason +PYTHONPATH="$(pwd)/../../build/src/python" python3 -m doctest -v *.rst