From 4b59edea02a5b75c397a718c8e4a59acf0ba01a6 Mon Sep 17 00:00:00 2001 From: mayeut Date: Sun, 13 Feb 2022 18:42:31 +0100 Subject: [PATCH 1/2] Add a manylinux_2_28 build --- .github/workflows/multibuild.yml | 16 ++++++-- .travis.yml | 68 ++++++++++++++++++++++---------- travis-ci/build_steps.sh | 3 ++ 3 files changed, 63 insertions(+), 24 deletions(-) diff --git a/.github/workflows/multibuild.yml b/.github/workflows/multibuild.yml index ac69cd8..410eda4 100644 --- a/.github/workflows/multibuild.yml +++ b/.github/workflows/multibuild.yml @@ -17,9 +17,11 @@ jobs: matrix: os: [ubuntu-latest, macos-latest] platform: [x64] - PLAT: [i686, x86_64] + #PLAT: [i686, x86_64] + PLAT: [x86_64] INTERFACE64: ['', '1'] - MB_ML_VER: ['', 2010, 2014] + #MB_ML_VER: ['', 2010, 2014, '_2_28'] + MB_ML_VER: ['_2_28'] include: - os: macos-latest PLAT: arm64 @@ -36,8 +38,12 @@ jobs: MB_ML_VER: 2010 - os: macos-latest MB_ML_VER: 2014 + - os: macos-latest + MB_ML_VER: '_2_28' - PLAT: i686 INTERFACE64: '1' + - PLAT: i686 + MB_ML_VER: '_2_28' env: REPO_DIR: OpenBLAS OPENBLAS_COMMIT: "5188aed" @@ -64,7 +70,11 @@ jobs: run: | if [ "macos-latest" == "${{ matrix.os }}" ]; then echo "TRAVIS_OS_NAME=osx" >> $GITHUB_ENV; else echo "TRAVIS_OS_NAME=${{ matrix.os }}" >> $GITHUB_ENV; fi if [ "macos-latest" == "${{ matrix.os }}" ]; then echo "LDFLAGS=-L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib" >> $GITHUB_ENV; fi - echo "DOCKER_TEST_IMAGE=$(echo multibuild/xenial_${{ matrix.PLAT}})" >> $GITHUB_ENV; + if [ "_2_28" == "${{ matrix.MB_ML_VER }}" ]; then + echo "DOCKER_TEST_IMAGE=$(echo multibuild/focal_${{ matrix.PLAT}})" >> $GITHUB_ENV; + else + echo "DOCKER_TEST_IMAGE=$(echo multibuild/xenial_${{ matrix.PLAT}})" >> $GITHUB_ENV; + fi - name: Print some Environment variable run: | echo "TRAVIS_OS_NAME: ${TRAVIS_OS_NAME}" diff --git a/.travis.yml b/.travis.yml index 6baff47..a0581c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,45 +23,71 @@ services: docker matrix: include: + #- os: linux + # arch: arm64 + # env: + # - PLAT=aarch64 + # - MB_ML_VER=2014 + # - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} + #- os: linux + # arch: arm64 + # env: + # - PLAT=aarch64 + # - INTERFACE64=1 + # - MB_ML_VER=2014 + # - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} + #- os: linux + # arch: s390x + # env: + # - PLAT=s390x + # - MB_ML_VER=2014 + # - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} + #- os: linux + # arch: s390x + # env: + # - PLAT=s390x + # - INTERFACE64=1 + # - MB_ML_VER=2014 + # - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} + #- os: linux + # arch: ppc64le + # env: + # - PLAT=ppc64le + # - MB_ML_VER=2014 + # - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} + #- os: linux + # arch: ppc64le + # env: + # - PLAT=ppc64le + # - INTERFACE64=1 + # - MB_ML_VER=2014 + # - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} - os: linux arch: arm64 env: - PLAT=aarch64 - - MB_ML_VER=2014 - - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} + - MB_ML_VER=_2_28 + - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT} - os: linux arch: arm64 env: - PLAT=aarch64 - INTERFACE64=1 - - MB_ML_VER=2014 - - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} - - os: linux - arch: s390x - env: - - PLAT=s390x - - MB_ML_VER=2014 - - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} - - os: linux - arch: s390x - env: - - PLAT=s390x - - INTERFACE64=1 - - MB_ML_VER=2014 - - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} + - MB_ML_VER=_2_28 + - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT} - os: linux arch: ppc64le env: - PLAT=ppc64le - - MB_ML_VER=2014 - - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} + - MB_ML_VER=_2_28 + - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT} - os: linux arch: ppc64le env: - PLAT=ppc64le - INTERFACE64=1 - - MB_ML_VER=2014 - - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} + - MB_ML_VER=_2_28 + - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT} before_install: - source travis-ci/build_steps.sh diff --git a/travis-ci/build_steps.sh b/travis-ci/build_steps.sh index 761370a..2e01086 100644 --- a/travis-ci/build_steps.sh +++ b/travis-ci/build_steps.sh @@ -49,6 +49,9 @@ function build_lib { fi # Manylinux wrapper local docker_image=quay.io/pypa/manylinux${manylinux}_${plat} + if [ "${manylinux}" == "_2_28" ]; then + docker_image=quay.io/pypa/manylinux${manylinux}_poc_${plat}:poc + fi docker pull $docker_image # Docker sources this script, and runs `do_build_lib` docker run --rm \ From 94992b1844fcdcbef02564b820d13fda39b70d89 Mon Sep 17 00:00:00 2001 From: mayeut Date: Sat, 19 Feb 2022 13:51:41 +0100 Subject: [PATCH 2/2] Re-enable all builds --- .github/workflows/multibuild.yml | 6 +-- .travis.yml | 78 ++++++++++++++++---------------- 2 files changed, 41 insertions(+), 43 deletions(-) diff --git a/.github/workflows/multibuild.yml b/.github/workflows/multibuild.yml index 410eda4..82ed72e 100644 --- a/.github/workflows/multibuild.yml +++ b/.github/workflows/multibuild.yml @@ -17,11 +17,9 @@ jobs: matrix: os: [ubuntu-latest, macos-latest] platform: [x64] - #PLAT: [i686, x86_64] - PLAT: [x86_64] + PLAT: [i686, x86_64] INTERFACE64: ['', '1'] - #MB_ML_VER: ['', 2010, 2014, '_2_28'] - MB_ML_VER: ['_2_28'] + MB_ML_VER: ['', 2010, 2014, '_2_28'] include: - os: macos-latest PLAT: arm64 diff --git a/.travis.yml b/.travis.yml index a0581c5..800e261 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,45 +23,45 @@ services: docker matrix: include: - #- os: linux - # arch: arm64 - # env: - # - PLAT=aarch64 - # - MB_ML_VER=2014 - # - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} - #- os: linux - # arch: arm64 - # env: - # - PLAT=aarch64 - # - INTERFACE64=1 - # - MB_ML_VER=2014 - # - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} - #- os: linux - # arch: s390x - # env: - # - PLAT=s390x - # - MB_ML_VER=2014 - # - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} - #- os: linux - # arch: s390x - # env: - # - PLAT=s390x - # - INTERFACE64=1 - # - MB_ML_VER=2014 - # - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} - #- os: linux - # arch: ppc64le - # env: - # - PLAT=ppc64le - # - MB_ML_VER=2014 - # - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} - #- os: linux - # arch: ppc64le - # env: - # - PLAT=ppc64le - # - INTERFACE64=1 - # - MB_ML_VER=2014 - # - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} + - os: linux + arch: arm64 + env: + - PLAT=aarch64 + - MB_ML_VER=2014 + - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} + - os: linux + arch: arm64 + env: + - PLAT=aarch64 + - INTERFACE64=1 + - MB_ML_VER=2014 + - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} + - os: linux + arch: s390x + env: + - PLAT=s390x + - MB_ML_VER=2014 + - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} + - os: linux + arch: s390x + env: + - PLAT=s390x + - INTERFACE64=1 + - MB_ML_VER=2014 + - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} + - os: linux + arch: ppc64le + env: + - PLAT=ppc64le + - MB_ML_VER=2014 + - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} + - os: linux + arch: ppc64le + env: + - PLAT=ppc64le + - INTERFACE64=1 + - MB_ML_VER=2014 + - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} - os: linux arch: arm64 env: