Merge pull request #89 from mattip/v0.3.21

mattip · web-flow · commit 81ebd3c2d24a · 2022-11-03T09:04:05.000+01:00
create OpenBLAS v0.3.21 builds
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-name: Windows build
+name: Win
 
 on:
   push:
@@ -7,7 +7,7 @@ on:
     branches: [ master ]
 
 env:
-  OPENBLAS_COMMIT: "bfd9c1b58cd3"
+  OPENBLAS_COMMIT: "v0.3.21"
   OPENBLAS_ROOT: "c:\\opt"
   # Preserve working directory for calls into bash
   CHERE_INVOKING: "yes"
@@ -73,9 +73,13 @@ jobs:
         with:
           path: builds/openblas*.zip
 
+      - uses: conda-incubator/setup-miniconda@v2
+        with:
+          activate-environment: upload
+
       - name: Upload
         env:
          OPENBLAS_LIBS_STAGING_UPLOAD_TOKEN: ${{ secrets.MULTIBUILD_WHEELS_STAGING_ACCESS }}
         run: |
-          pip install -q git+https://github.com/Anaconda-Platform/anaconda-client@1.8.0
+          conda install anaconda-client
           & $env:BASH_PATH -lc tools/upload_to_anaconda_staging.sh
diff --git a/.github/workflows/multibuild.yml b/.github/workflows/multibuild.yml
@@ -1,4 +1,4 @@
-name: Linux,macOS build
+name: multibuild
 
 on:
   push:
@@ -15,17 +15,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, macos-11]
         platform: [x64]
         PLAT: [i686, x86_64]
         INTERFACE64: ['', '1']
         MB_ML_VER: ['', 2010, 2014]
         include:
-          - os: macos-latest
+          - os: macos-11
             PLAT: arm64
             INTERFACE64: '1'
             platform: [x64]
-          - os: macos-latest
+          - os: macos-11
             PLAT: arm64
             INTERFACE64: ''
             platform: [x64]
@@ -42,17 +42,17 @@ jobs:
             MB_ML_VER: _1_1
             platform: [x64]
         exclude:
-          - os: macos-latest
+          - os: macos-11
             PLAT: i686
-          - os: macos-latest
+          - os: macos-11
             MB_ML_VER: 2010
-          - os: macos-latest
+          - os: macos-11
             MB_ML_VER: 2014
           - PLAT: i686
             INTERFACE64: '1'
     env:
       REPO_DIR: OpenBLAS
-      OPENBLAS_COMMIT: "bfd9c1b58cd3"
+      OPENBLAS_COMMIT: "v0.3.21"
       MACOSX_DEPLOYMENT_TARGET: 10.9
       MB_PYTHON_VERSION: ${{ matrix.python-version }}
       TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
@@ -75,8 +75,13 @@ jobs:
         python-version: 3.8
     - name: Set extra env
       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
+        if [ "macos-11" == "${{ matrix.os }}" ]; then
+          echo "TRAVIS_OS_NAME=osx" >> $GITHUB_ENV;
+          echo "LDFLAGS=-L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib" >> $GITHUB_ENV;
+          echo "LIBRARY_PATH=-L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib" >> $GITHUB_ENV;
+        else
+          echo "TRAVIS_OS_NAME=${{ matrix.os }}" >> $GITHUB_ENV;
+        fi
         echo "DOCKER_TEST_IMAGE=$(echo multibuild/xenial_${{ matrix.PLAT}})" >> $GITHUB_ENV;
     - name: Print some Environment variable
       run: |
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ env:
     global:
         # The archive that gets built has name from ``git describe`` on this
         # commit.
-        - OPENBLAS_COMMIT="bfd9c1b58cd3"
+        - OPENBLAS_COMMIT="v0.3.21"
         - REPO_DIR=OpenBLAS
         # Following generated with:
         # travis encrypt -r MacPython/openblas-libs OPENBLAS_LIBS_STAGING_UPLOAD_TOKEN=<secret token value>
diff --git a/OpenBLAS b/OpenBLAS
@@ -1 +1 @@
-Subproject commit bfd9c1b58cd347517d4849f06504011522cc640f
+Subproject commit 0b678b19dc03f2a999d6e038814c4c50b9640a4e
diff --git a/multibuild b/multibuild
@@ -1 +1 @@
-Subproject commit 3d5effd42fa96635beea9f007908429876e1d88a
+Subproject commit d4b02ce8c707c8a2bcc721e29f2385149f994b1f
