From 218b2dfed69d4118c8c69ac426dc60567734839e Mon Sep 17 00:00:00 2001 From: Greg Lin Date: Tue, 9 Aug 2022 16:55:09 -0500 Subject: [PATCH] Make check for R 3.3.x bug easier to maintain CentOS 7 is the last distro affected by this bug, so invert the logic to make maintenance easier. --- handler.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/handler.py b/handler.py index 7edd952..ada133c 100644 --- a/handler.py +++ b/handler.py @@ -128,17 +128,9 @@ def queue_builds(event, context): for platform in event['supported_platforms']: # In R 3.3.0, 3.3.1, and 3.3.2, the configure script check for the # zlib version fails to handle versions longer than 5 characters. - # Skip builds affected by this bug. - if platform in [ - 'ubuntu-2204', - 'ubuntu-2004', - 'ubuntu-1804', - 'opensuse-153', - 'centos-8', - 'rhel-9', - 'debian-10', - 'debian-11', - ] and version in ['3.3.0', '3.3.1', '3.3.2']: + # Skip builds affected by this bug. Most newer distros will be affected. + # https://github.com/rstudio/r-builds/issues/76 + if version in ['3.3.0', '3.3.1', '3.3.2'] and platform not in ['centos-7']: continue job_ids.append(_submit_job(version, platform)) event['jobIds'] = job_ids