From 3e67babd435f2378ca605526a97ac063dc75acea Mon Sep 17 00:00:00 2001 From: Leonard Lausen Date: Mon, 27 Apr 2020 18:39:46 +0000 Subject: [PATCH 1/2] Fail build_windows.py if all retries failed --- ci/build_windows.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ci/build_windows.py b/ci/build_windows.py index b9c17a855954..20be6ee51443 100755 --- a/ci/build_windows.py +++ b/ci/build_windows.py @@ -188,7 +188,10 @@ def windows_build(args): logging.info("Build flavour: {} complete in directory: \"{}\"".format(args.flavour, os.path.abspath(path))) logging.info("Build took {}".format(datetime.timedelta(seconds=int(time.time() - t0)))) break - windows_package(args) + if ret == 0: + windows_package(args) + else: + sys.exit(1) def windows_package(args): From 36b7610ff033a8f9a0614468f9bfb126a1a7b490 Mon Sep 17 00:00:00 2001 From: Leonard Lausen Date: Mon, 27 Apr 2020 21:06:09 +0000 Subject: [PATCH 2/2] Fix pylint with unpinned astroid causing CI issues --- ci/docker/install/requirements | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/docker/install/requirements b/ci/docker/install/requirements index 94f550b18127..4e4340ee46f1 100644 --- a/ci/docker/install/requirements +++ b/ci/docker/install/requirements @@ -33,7 +33,8 @@ Cython==0.29.7 # Development dependencies cpplint==1.3.0 -pylint==2.3.1; python_version >= '3.0' +pylint==2.3.1 # pylint and astroid need to be aligned +astroid==2.3.3 # pylint and astroid need to be aligned pytest==5.3.5 pytest-env==0.6.2 pytest-cov==2.8.1