cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace /root/project by /project

Browse Source
This commit is contained in:
Rodrigo Q. Saramago 2022-09-12 14:53:15 +02:00
parent 6b570c4621
commit 3b16174190
No known key found for this signature in database
GPG Key ID: 9B36B2525704A359
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.circleci/config.yml
View File

@ -1016,15 +1016,15 @@ jobs:
- store_artifacts: *artifacts_test_results - store_artifacts: *artifacts_test_results
- gitter_notify_failure_unless_pr - gitter_notify_failure_unless_pr
# NOTE: work around to git unsafe repository error by adding /root/project as a safe.directory
# See https://github.com/CircleCI-Public/cimg-base/issues/170
b_ems: b_ems:
<<: *base_ems_large <<: *base_ems_large
environment: environment:
TERM: xterm TERM: xterm
MAKEFLAGS: -j 10 MAKEFLAGS: -j 10
steps: steps:
- run: git config --global --add safe.directory /root/project # NOTE: work around to git unsafe repository error by adding /project as a safe.directory
# See https://github.com/CircleCI-Public/cimg-base/issues/170
- run: git config --global --add safe.directory /project
- checkout - checkout
- run: - run:
name: Build name: Build

2
scripts/build_emscripten.sh
View File

@ -38,4 +38,4 @@ fi
docker run --volume "$(pwd):/project" --workdir /project \ docker run --volume "$(pwd):/project" --workdir /project \
--user "1000:1000" \ --user "1000:1000" \
solbuildpackpusher/solidity-buildpack-deps@sha256:f1c13f3450d1f2e53ea18ac1ac1a17e932573cb9a5ccd0fd9ef6dd44f6402fa9 \ solbuildpackpusher/solidity-buildpack-deps@sha256:f1c13f3450d1f2e53ea18ac1ac1a17e932573cb9a5ccd0fd9ef6dd44f6402fa9 \
./scripts/ci/build_emscripten.sh "$BUILD_DIR" /project ./scripts/ci/build_emscripten.sh "$BUILD_DIR"

4
scripts/ci/build_emscripten.sh
View File

@ -40,9 +40,9 @@ else
BUILD_DIR="$1" BUILD_DIR="$1"
fi fi
WORKSPACE="${2:-/root/project}" WORKSPACE=/project
cd "$WORKSPACE" cd $WORKSPACE
# shellcheck disable=SC2166 # shellcheck disable=SC2166
if [[ "$CIRCLE_BRANCH" = release || -n "$CIRCLE_TAG" || -n "$FORCE_RELEASE" || "$(git tag --points-at HEAD 2>/dev/null)" == v* ]] if [[ "$CIRCLE_BRANCH" = release || -n "$CIRCLE_TAG" || -n "$FORCE_RELEASE" || "$(git tag --points-at HEAD 2>/dev/null)" == v* ]]

2
scripts/ci/build_ossfuzz.sh
View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
ROOTDIR="/root/project" ROOTDIR="/project"
BUILDDIR="${ROOTDIR}/build" BUILDDIR="${ROOTDIR}/build"
mkdir -p "${BUILDDIR}" && mkdir -p "$BUILDDIR/deps" mkdir -p "${BUILDDIR}" && mkdir -p "$BUILDDIR/deps"

8
scripts/ci/docker_upgrade.sh
View File

@ -51,16 +51,16 @@ docker build "scripts/docker/${IMAGE_NAME}" --file "scripts/docker/${IMAGE_NAME}
echo "-- test_docker @ '${PWD}'" echo "-- test_docker @ '${PWD}'"
# NOTE: Since /root/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. # 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/ # See https://github.blog/2022-04-12-git-security-vulnerability-announced/
docker run \ docker run \
--rm \ --rm \
--volume "${PWD}:/root/project" \ --volume "${PWD}:/project" \
"${IMAGE_NAME}" \ "${IMAGE_NAME}" \
bash -c " bash -c "
git config --global --add safe.directory /root/project && git config --global --add safe.directory /project &&
/root/project/scripts/ci/${IMAGE_NAME}_test_${IMAGE_VARIANT}.sh /project/scripts/ci/${IMAGE_NAME}_test_${IMAGE_VARIANT}.sh
" "
echo "-- push_docker" echo "-- push_docker"

8
scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
View File

@ -183,14 +183,14 @@ function process_tag
cd /tmp cd /tmp
echo "Check out solidity repository..." echo "Check out solidity repository..."
if [ -d /root/project ]; then if [ -d /project ]; then
echo "Solidity repo checkout already exists." echo "Solidity repo checkout already exists."
else else
git clone "${SOLIDITY_REPO_URL}" /root/project --quiet git clone "${SOLIDITY_REPO_URL}" /project --quiet
fi fi
echo "Extract bytecode comparison scripts from v0.6.1..." echo "Extract bytecode comparison scripts from v0.6.1..."
cd /root/project cd /project
git checkout v0.6.1 --quiet git checkout v0.6.1 --quiet
cp scripts/bytecodecompare/storebytecode.sh /tmp cp scripts/bytecodecompare/storebytecode.sh /tmp
# shellcheck disable=SC2016 # shellcheck disable=SC2016
@ -212,7 +212,7 @@ ln -sf /emsdk_portable/emscripten/sdk/ /emsdk_portable/
ln -sf sdk /emsdk_portable/emscripten/bin ln -sf sdk /emsdk_portable/emscripten/bin
ln -sf /emsdk_portable/emscripten/bin/* /usr/local/bin ln -sf /emsdk_portable/emscripten/bin/* /usr/local/bin
rm -rf /src rm -rf /src
ln -sf /root/project /src ln -sf /project /src
echo "Install dependencies and upgrade system packages." echo "Install dependencies and upgrade system packages."
apt-get -qq update >/dev/null 2>&1 apt-get -qq update >/dev/null 2>&1