diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/ci/run-jenkins.sh | 18 | ||||
| -rwxr-xr-x | scripts/ci/run-test-default.sh | 15 |
2 files changed, 17 insertions, 16 deletions
diff --git a/scripts/ci/run-jenkins.sh b/scripts/ci/run-jenkins.sh index 1b2eda871ee..e0ad1059ac0 100755 --- a/scripts/ci/run-jenkins.sh +++ b/scripts/ci/run-jenkins.sh @@ -270,8 +270,24 @@ elif [[ ${CI_TAGS} == *'stress-tests'* ]]; then ${MONO_REPO_ROOT}/sc elif [[ ${CI_TAGS} == *'interpreter'* ]]; then ${MONO_REPO_ROOT}/scripts/ci/run-test-interpreter.sh; elif [[ ${CI_TAGS} == *'mcs-compiler'* ]]; then ${MONO_REPO_ROOT}/scripts/ci/run-test-mcs.sh; elif [[ ${CI_TAGS} == *'mac-sdk'* ]]; then ${MONO_REPO_ROOT}/scripts/ci/run-test-mac-sdk.sh; -elif [[ ${CI_TAGS} == *'no-tests'* ]]; then exit 0; +elif [[ ${CI_TAGS} == *'no-tests'* ]]; then echo "Skipping tests."; else make check-ci; fi +if [[ $CI_TAGS == *'apidiff'* ]]; then + if ${TESTCMD} --label=apidiff --timeout=15m --fatal make -w -C mcs -j ${CI_CPU_COUNT} mono-api-diff + then report_github_status "success" "API Diff" "No public API changes found." || true + else report_github_status "error" "API Diff" "The public API changed." "$BUILD_URL/Public_20API_20Diff/" || true + fi +else ${TESTCMD} --label=apidiff --skip +fi +if [[ $CI_TAGS == *'csprojdiff'* ]]; then + make update-solution-files + if ${TESTCMD} --label=csprojdiff --timeout=5m --fatal make -w -C mcs mono-csproj-diff + then report_github_status "success" "Project Files Diff" "No csproj file changes found." || true + else report_github_status "error" "Project Files Diff" "The csproj files changed." "$BUILD_URL/Project_20Files_20Diff/" || true + fi +else ${TESTCMD} --label=csprojdiff --skip +fi + ${MONO_REPO_ROOT}/scripts/ci/run-upload-sentry.sh diff --git a/scripts/ci/run-test-default.sh b/scripts/ci/run-test-default.sh index 312ea53cf7d..e4204ce6dde 100755 --- a/scripts/ci/run-test-default.sh +++ b/scripts/ci/run-test-default.sh @@ -142,19 +142,4 @@ fi ${TESTCMD} --label=bundle-test-results --timeout=2m find . -name "TestResult*.xml" -exec tar -rvf TestResults.tar {} \; -if [[ $CI_TAGS == *'apidiff'* ]]; then - if ${TESTCMD} --label=apidiff --timeout=15m --fatal make -w -C mcs -j ${CI_CPU_COUNT} mono-api-diff - then report_github_status "success" "API Diff" "No public API changes found." || true - else report_github_status "error" "API Diff" "The public API changed." "$BUILD_URL/Public_20API_20Diff/" || true - fi -else ${TESTCMD} --label=apidiff --skip -fi -if [[ $CI_TAGS == *'csprojdiff'* ]]; then - make update-solution-files - if ${TESTCMD} --label=csprojdiff --timeout=5m --fatal make -w -C mcs mono-csproj-diff - then report_github_status "success" "Project Files Diff" "No csproj file changes found." || true - else report_github_status "error" "Project Files Diff" "The csproj files changed." "$BUILD_URL/Project_20Files_20Diff/" || true - fi -else ${TESTCMD} --label=csprojdiff --skip -fi rm -fr /tmp/jenkins-temp-aspnet* |