Once more into the breach

davisp · Feb 17, 2025 · 0c2b060 · 0c2b060
1 parent 1e803a8
commit 0c2b060
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/.github/scripts/generate-build-matrix.py b/.github/scripts/generate-build-matrix.py
@@ -19,28 +19,28 @@
         "manylinux": "quay.io/pypa/manylinux_2_28_x86_64",
         "triplet": "x64-linux-release"
     },
-    {
-        "platform": "linux-x86_64-noavx2",
-        "os": "ubuntu-20.04",
-        "cmake_args": "-DCOMPILER_SUPPORTS_AVX2=OFF",
-        "triplet": "x64-linux-release",
-        "manylinux": "quay.io/pypa/manylinux_2_28_x86_64"
-    },
-    # Disabling this platform during development as the runners are constantly
-    # not getting kicked off due to I assume backlog on this architecture.
+    # Disabling everything except one Linux and one macOS build during
+    # development.
+    # {
+    #     "platform": "linux-x86_64-noavx2",
+    #     "os": "ubuntu-20.04",
+    #     "cmake_args": "-DCOMPILER_SUPPORTS_AVX2=OFF",
+    #     "triplet": "x64-linux-release",
+    #     "manylinux": "quay.io/pypa/manylinux_2_28_x86_64"
+    # },
     # {
     #     "platform": "linux-aarch64",
     #     "os": "linux-arm64-ubuntu24",
     #     "triplet": "arm64-linux-release",
     #     "manylinux": "quay.io/pypa/manylinux_2_28_aarch64"
     # },
-    {
-        "platform": "macos-x86_64",
-        "os": "macos-13",
-        "cmake_args": "-DCMAKE_OSX_ARCHITECTURES=x86_64",
-        "MACOSX_DEPLOYMENT_TARGET": "11",
-        "triplet": "x64-osx-release"
-    },
+    # {
+    #     "platform": "macos-x86_64",
+    #     "os": "macos-13",
+    #     "cmake_args": "-DCMAKE_OSX_ARCHITECTURES=x86_64",
+    #     "MACOSX_DEPLOYMENT_TARGET": "11",
+    #     "triplet": "x64-osx-release"
+    # },
     {
         "platform": "macos-arm64",
         "os": "macos-latest",

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -35,7 +35,7 @@ jobs:
   build:
     needs:
       - generate-matrix
-    name: Build - ${{ matrix.platform }} - ${{ matrix.version }} - ${{ matrix.linkage }}
+    name: Build - ${{ matrix.version }} - ${{ matrix.linkage }} - ${{ matrix.platform }}
     strategy:
       fail-fast: false
       matrix:
@@ -80,7 +80,7 @@ jobs:
           cd ~/repos/tiledb
           hash=$( git rev-parse --short HEAD )
           version=${{ matrix.version }}
-          if [ "x${{ matrix.build_shared_libs }}" == "xOFF"]; then
+          if [ "x${{ matrix.build_shared_libs }}" == "xOFF" ]; then
             suffix="-static"
           else
             suffix=""
@@ -114,7 +114,7 @@ jobs:
         run: |
           cd ~/repos/tiledb
           mkdir build
-          touch build/tiledb-${{ matrix.platform }}-${{ env.TILEDB_PACKAGE_VERSION }}.tar.gz*
+          touch build/tiledb-${{ matrix.platform }}-${{ env.TILEDB_PACKAGE_VERSION }}.tar.gz
         shell: bash
         # run: |
         #   cd ~/repos/tiledb