From 26a33cdbfaa6bbfc1feb1d76ce59fb727c072839 Mon Sep 17 00:00:00 2001 From: Vitaly Buka Date: Wed, 6 Nov 2024 16:35:27 -0800 Subject: [PATCH] Revert "Reapply "[sanitize] Don't build older then 1h requests"" (#296) Reverts llvm/llvm-zorg#295 Try again according to https://github.com/llvm/llvm-zorg/pull/266#issuecomment-2460946503 --- zorg/buildbot/builders/sanitizers/buildbot_functions.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/zorg/buildbot/builders/sanitizers/buildbot_functions.sh b/zorg/buildbot/builders/sanitizers/buildbot_functions.sh index 3a0710f5a..7b54de1f1 100755 --- a/zorg/buildbot/builders/sanitizers/buildbot_functions.sh +++ b/zorg/buildbot/builders/sanitizers/buildbot_functions.sh @@ -144,11 +144,6 @@ function buildbot_update { git checkout -f "${BUILDBOT_REVISION}" git status git rev-list --pretty --max-count=1 HEAD - # FIXME: Workaround for https://github.com/llvm/llvm-zorg/issues/250 - [[ "${SKIP_OLD:-1}" == "0" ]] || [[ ! -v BUILDBOT_SCHEDULER ]] || [[ "${BUILDBOT_SCHEDULER}" == "force-build-scheduler" ]] || (git log -1 --after='3 hours ago' | grep .) || { - echo Revision is not recent enough - exit 1 - } ) || { build_exception ; exit 1 ; } LLVM=$ROOT/llvm-project/llvm fi @@ -209,7 +204,7 @@ function build_clang_at_release_tag { then echo "@@@BUILD_STEP using pre-built stage1 clang at r${host_clang_revision}@@@" else - SKIP_OLD=0 BUILDBOT_MONO_REPO_PATH= BUILDBOT_REVISION="${host_clang_revision}" buildbot_update + BUILDBOT_MONO_REPO_PATH= BUILDBOT_REVISION="${host_clang_revision}" buildbot_update rm -rf ${STAGE1_DIR} echo @@@BUILD_STEP build stage1 clang at $host_clang_revision@@@