From b5e97fb084676423e9f5e27037570de553ec527f Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 17 Nov 2021 14:45:09 +1100 Subject: [PATCH 1/4] increase timeout on azure to 150min --- azure-posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-posix.yml b/azure-posix.yml index 2a69bab..8e10943 100644 --- a/azure-posix.yml +++ b/azure-posix.yml @@ -5,7 +5,7 @@ parameters: jobs: - job: ${{ parameters.name }} - timeoutInMinutes: 90 + timeoutInMinutes: 150 pool: vmImage: ${{ parameters.vmImage }} variables: From 6955cf0ef48e733bfd4ea1047bc2f8f5f43b8019 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 17 Nov 2021 14:54:34 +1100 Subject: [PATCH 2/4] remove redundant MB_ML_VER --- azure-posix.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/azure-posix.yml b/azure-posix.yml index 8e10943..5d36fd3 100644 --- a/azure-posix.yml +++ b/azure-posix.yml @@ -13,7 +13,6 @@ jobs: PLAT: "x86_64" NIGHTLY_BUILD_COMMIT: "master" DAILY_COMMIT: "master" - MB_ML_VER: "1" strategy: matrix: ${{ insert }}: ${{ parameters.matrix }} From 147e587f22572e8ba321f427c219d28a04bb9e20 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 17 Nov 2021 15:57:09 +1100 Subject: [PATCH 3/4] update submodule multibuild & temporarily point to my fork --- .gitmodules | 2 +- multibuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2ab04a4..1310188 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,7 +6,7 @@ url = https://github.com/scipy/scipy.git [submodule "multibuild"] path = multibuild - url = https://github.com/matthew-brett/multibuild.git + url = https://github.com/h-vetinari/multibuild.git [submodule "gfortran-install"] path = gfortran-install url = https://github.com/MacPython/gfortran-install.git diff --git a/multibuild b/multibuild index b89bb90..0abf01e 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit b89bb903e94308be79abefa4f436bf123ebb1313 +Subproject commit 0abf01e4fed037c1f302104d5536d78e5fd63510 From 0de7cd77aa533fc472a216feb24fb27ff2bad8d2 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 17 Nov 2021 16:19:05 +1100 Subject: [PATCH 4/4] bump gfortran to 5.1.0 & temporarily point to my fork --- .gitmodules | 2 +- gfortran-install | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1310188..0756f7c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,7 +9,7 @@ url = https://github.com/h-vetinari/multibuild.git [submodule "gfortran-install"] path = gfortran-install - url = https://github.com/MacPython/gfortran-install.git + url = https://github.com/h-vetinari/gfortran-install.git [submodule "numpy-distutils"] path = numpy-distutils url = https://github.com/numpy/numpy.git diff --git a/gfortran-install b/gfortran-install index 4148a01..fadb886 160000 --- a/gfortran-install +++ b/gfortran-install @@ -1 +1 @@ -Subproject commit 4148a01d4b0209e4a5933968a0be62f0f3b2c1ca +Subproject commit fadb8868f825b915177fb4cf5996054cad0cc944