diff --git a/.gitignore b/.gitignore index d3c45d403d..aab58f91e0 100644 --- a/.gitignore +++ b/.gitignore @@ -213,3 +213,5 @@ FakesAssemblies/ /src/Tools/npm/dotvvm-types/*.d.ts /src/DotVVM.Framework/junit.xml artifacts/ +.nuget/ +.npm/ diff --git a/ci/linux/run.sh b/ci/linux/run.sh index c0f12493bb..3b3530b972 100755 --- a/ci/linux/run.sh +++ b/ci/linux/run.sh @@ -1,14 +1,17 @@ #/bin/bash ROOT=${DOTVVM_ROOT:-$(pwd)} +# override DOTVVM_ROOT in case this is a local build +export DOTVVM_ROOT=$ROOT + CONFIGURATION=${BUILD_CONFIGURATION:-Release} TEST_RESULTS_DIR=$ROOT/artifacts/tests DISPLAY=${DISPLAY:-":42"} -echo "ROOT=$DOTVVM_ROOT" +echo "ROOT=$ROOT" echo "CONFIGURATION=$CONFIGURATION" cd $ROOT/src/DotVVM.Framework \ - && npm ci --cache $(DOTVVM_ROOT)/.npm --prefer-offline \ + && npm ci --cache ${ROOT}/.npm --prefer-offline \ && npm run build if [ $? -ne 0 ]; then @@ -16,9 +19,6 @@ if [ $? -ne 0 ]; then exit 1 fi -# override DOTVVM_ROOT in case this is a local build -export DOTVVM_ROOT=$ROOT - cd $ROOT \ && dotnet restore $ROOT/ci/linux/Linux.sln --packages $ROOT/.nuget\ && dotnet build $ROOT/ci/linux/Linux.sln --no-restore --configuration $CONFIGURATION