From f2de085dfe28ca1ac16f11aa01ab626d9eadc376 Mon Sep 17 00:00:00 2001 From: "Rodrigo Q. Saramago" Date: Mon, 12 Sep 2022 16:55:23 +0200 Subject: [PATCH] Minor fix --- .circleci/config.yml | 4 ++-- scripts/ci/docker_upgrade.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9912e68e7..1f32b5e03 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1043,9 +1043,9 @@ jobs: TERM: xterm MAKEFLAGS: -j 10 steps: - # NOTE: work around to git unsafe repository error by adding /project as a safe.directory + # NOTE: work around to git unsafe repository error by adding $CIRCLE_WORKING_DIRECTORY as a safe.directory # See https://github.com/CircleCI-Public/cimg-base/issues/170 - - run: git config --global --add safe.directory /project + - run: git config --global --add safe.directory ${CIRCLE_WORKING_DIRECTORY} - checkout - run: name: Build diff --git a/scripts/ci/docker_upgrade.sh b/scripts/ci/docker_upgrade.sh index 5cf233ebd..bd181cef6 100755 --- a/scripts/ci/docker_upgrade.sh +++ b/scripts/ci/docker_upgrade.sh @@ -51,7 +51,7 @@ docker build "scripts/docker/${IMAGE_NAME}" --file "scripts/docker/${IMAGE_NAME} echo "-- test_docker @ '${PWD}'" -# NOTE: Since /project/ is a dir from outside the container and the owner of the files is different, +# NOTE: Since ~/project is a dir from outside the container and the owner of the files is different, # git show in the script refuses to work. It must be marked as safe to use first. # See https://github.blog/2022-04-12-git-security-vulnerability-announced/ docker run \