[PATCH 2/2] CI: enable t1509 in Travis and GitHub Actions
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
---
ci/lib.sh | 13 +++++++++++++
ci/run-docker-build.sh | 3 +++
2 files changed, 16 insertions(+)
diff --git a/ci/lib.sh b/ci/lib.sh
index dac36886e3..e9c22ae718 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -113,6 +113,7 @@ then
export GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
export GIT_TEST_OPTS="--verbose-log -x --immediate"
MAKEFLAGS="$MAKEFLAGS --jobs=2"
+ t1509_allowed=YES
elif test -n "$SYSTEM_COLLECTIONURI" || test -n "$SYSTEM_TASKDEFINITIONSURI"
then
CI_TYPE=azure-pipelines
@@ -162,6 +163,7 @@ then
echo "::add-matcher::ci/git-problem-matcher.json"
test linux-musl = "$jobname" ||
MAKEFLAGS="$MAKEFLAGS TEST_SHELL_PATH=/bin/sh"
+ t1509_allowed=YES
else
echo "Could not identify CI type" >&2
env >&2
@@ -184,6 +186,17 @@ export DEVELOPER=1
export DEFAULT_TEST_TARGET=prove
export GIT_TEST_CLONE_2GB=true
+if test "$t1509_allowed" = YES
+then
+ case "$jobname" in
+ osx-*) ;;
+ *)
+ chmod a+w / || sudo chmod a+w / || true
+ export IKNOWWHATIAMDOING=YES
+ ;;
+ esac
+fi
+
case "$jobname" in
linux-clang|linux-gcc)
if [ "$jobname" = linux-gcc ]
diff --git a/ci/run-docker-build.sh b/ci/run-docker-build.sh
index 8d47a5fda3..026afe275a 100755
--- a/ci/run-docker-build.sh
+++ b/ci/run-docker-build.sh
@@ -58,6 +58,8 @@ else
test -n "$cache_dir" && chown -R $HOST_UID:$HOST_UID "$cache_dir"
fi
+chmod a+w /
+
# Build and test
command $switch_cmd su -m -l $CI_USER -c "
set -ex
@@ -68,6 +70,7 @@ command $switch_cmd su -m -l $CI_USER -c "
export GIT_TEST_CLONE_2GB='$GIT_TEST_CLONE_2GB'
export MAKEFLAGS='$MAKEFLAGS'
export cache_dir='$cache_dir'
+ export IKNOWWHATIAMDOING=YES
cd /usr/src/git
test -n '$cache_dir' && ln -s '$cache_dir/.prove' t/.prove
make
--
2.26.2.672.g232c24e857