From 087f903e464b96902df73e7d969b91d9b2d48891 Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 31 May 2021 08:09:05 +0000 Subject: [PATCH] change to GITHUB_WORKSPACE --- prepare-build.sh | 2 +- setup-goma-client.sh | 14 +++++++------- start-build.sh | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/prepare-build.sh b/prepare-build.sh index 02c71b9..0953bad 100644 --- a/prepare-build.sh +++ b/prepare-build.sh @@ -28,7 +28,7 @@ git apply ../bromite-buildtools/depot_tools.diff cd .. echo -e ${RED} -------- set envs ${NC} -PATH=$PWD/chromium/src/third_party/llvm-build/Release+Asserts/bin:$PWD/depot_tools/:/usr/local/go/bin:$PATH +PATH=$GITHUB_WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$GITHUB_WORKSPACE/depot_tools/:/usr/local/go/bin:$PATH echo -e ${RED} -------- download chromium pre-prepared ${NC} rm chromium.$VERSION.tar.gz diff --git a/setup-goma-client.sh b/setup-goma-client.sh index c506b3d..31f1c9f 100644 --- a/setup-goma-client.sh +++ b/setup-goma-client.sh @@ -1,21 +1,21 @@ #!/bin/bash echo -e ${RED} -------- set envs ${NC} -PATH=$PWD/chromium/src/third_party/llvm-build/Release+Asserts/bin:$PWD/depot_tools/:/usr/local/go/bin:$PATH +PATH=$GITHUB_WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$GITHUB_WORKSPACE/depot_tools/:/usr/local/go/bin:$PATH -cipd install infra/goma/client/linux-amd64 -root $PWD/goma +cipd install infra/goma/client/linux-amd64 -root $GITHUB_WORKSPACE/goma -cat "nomatter" >$PWD/.debug_auth_file -sudo cp $PWD/bromite-buildtools/goma_auth.py $PWD/goma/ +cat "nomatter" >$GITHUB_WORKSPACE/.debug_auth_file +sudo cp $GITHUB_WORKSPACE/bromite-buildtools/goma_auth.py $GITHUB_WORKSPACE/goma/ export GOMA_SERVER_HOST=127.0.0.1 export GOMA_SERVER_PORT=5050 export GOMA_USE_SSL=false -export GOMA_HTTP_AUTHORIZATION_FILE=$PWD/.debug_auth_file +export GOMA_HTTP_AUTHORIZATION_FILE=$GITHUB_WORKSPACE/.debug_auth_file export GOMA_HERMETIC=error export GOMA_USE_LOCAL=false export GOMA_FALLBACK=true export GOMA_ARBITRARY_TOOLCHAIN_SUPPORT=true -$PWD/goma/goma_ctl.py ensure_stop -$PWD/goma/goma_ctl.py ensure_start +$GITHUB_WORKSPACE/goma/goma_ctl.py ensure_stop +$GITHUB_WORKSPACE/goma/goma_ctl.py ensure_start diff --git a/start-build.sh b/start-build.sh index 7a12680..6089653 100644 --- a/start-build.sh +++ b/start-build.sh @@ -10,12 +10,12 @@ NC='\033[0m' # No Color #sudo apt-get install -y libxkbcommon-x11-0 libxkbcommon-dev echo -e ${RED} -------- set envs ${NC} -PATH=$PWD/chromium/src/third_party/llvm-build/Release+Asserts/bin:$PWD/depot_tools/:/usr/local/go/bin:$PATH +PATH=$GITHUB_WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$GITHUB_WORKSPACE/depot_tools/:/usr/local/go/bin:$PATH cd chromium/src echo -e ${RED} -------- gn gen ${NC} -gn gen --args="$(cat ../../bromite/build/GN_ARGS) target_cpu=\"x86\" use_goma=true goma_dir=\"../../goma\" " out/x86 +gn gen --args="$(cat ../../bromite/build/GN_ARGS) target_cpu=\"x86\" use_goma=true goma_dir=\"$GITHUB_WORKSPACE/goma\" " out/x86 echo -e ${RED} -------- checking prebuild ${NC} rm out.$GITHUB_SHA.tar.gz