From 00f7811683705b8133f3533a9b1ec09fc92ab432 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexander=20K=C3=B6plinger?= Date: Tue, 13 Jun 2017 18:07:47 +0200 Subject: [PATCH] [ci] Get rid of remaining usages of WORKSPACE env var Most of it was already removed in ea519ada8c38cae67f56e27ca70d32923ce9f23a --- packaging/Windows/defs/mono | 2 +- packaging/Windows/defs/mono64 | 2 +- scripts/ci/run-test-acceptance-tests.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/Windows/defs/mono b/packaging/Windows/defs/mono index 0aec09d9ea3..aa7f81f8340 100755 --- a/packaging/Windows/defs/mono +++ b/packaging/Windows/defs/mono @@ -29,7 +29,7 @@ build() pushd ${REPODIR} report "Building Mono" mkdir -p ${INSTALLDIR} - WORKSPACE=${REPODIR} EXTRA_CONF_FLAGS="--prefix=${INSTALLDIR}" ghprbPullId=1 CI_TAGS="no-tests" label="w32" scripts/ci/run-jenkins.sh || error "*** Could not run autogen ***" + EXTRA_CONF_FLAGS="--prefix=${INSTALLDIR}" CI_TAGS="no-tests" label="w32" scripts/ci/run-jenkins.sh || error "*** Could not run autogen ***" popd } diff --git a/packaging/Windows/defs/mono64 b/packaging/Windows/defs/mono64 index bdfaabbbfac..2d7dcc5f8d8 100755 --- a/packaging/Windows/defs/mono64 +++ b/packaging/Windows/defs/mono64 @@ -29,7 +29,7 @@ build() pushd ${REPODIR} report "Building Mono" mkdir -p ${INSTALLDIR} - WORKSPACE=${REPODIR} EXTRA_CONF_FLAGS="--prefix=${INSTALLDIR}" ghprbPullId=1 CI_TAGS="no-tests" label="w64" scripts/ci/run-jenkins.sh || error "*** Could not run autogen ***" + EXTRA_CONF_FLAGS="--prefix=${INSTALLDIR}" CI_TAGS="no-tests" label="w64" scripts/ci/run-jenkins.sh || error "*** Could not run autogen ***" popd } diff --git a/scripts/ci/run-test-acceptance-tests.sh b/scripts/ci/run-test-acceptance-tests.sh index 91e16caf6b8..5b35712b610 100755 --- a/scripts/ci/run-test-acceptance-tests.sh +++ b/scripts/ci/run-test-acceptance-tests.sh @@ -10,7 +10,7 @@ if [ "$total_tests" -lt "1600" ] exit 1 fi -${TESTCMD} --label=check-roslyn --timeout=30m make -C acceptance-tests check-roslyn PREFIX=${WORKSPACE}/tmp/mono-acceptance-tests +${TESTCMD} --label=check-roslyn --timeout=30m make -C acceptance-tests check-roslyn PREFIX=${MONO_REPO_ROOT}/tmp/mono-acceptance-tests rm -rf ${MONO_REPO_ROOT}/tmp/mono-acceptance-tests # cleanup the Mono installation used for Roslyn tests ${TESTCMD} --label=coreclr-compile-tests --timeout=80m --fatal make -C acceptance-tests coreclr-compile-tests -- 2.25.1