From 68b491671527d090282e3411f78a7bd2a4b36b0b Mon Sep 17 00:00:00 2001
From: Jake Arkinstall <65358059+jake-arkinstall@users.noreply.github.com>
Date: Wed, 19 Nov 2025 11:47:03 +0000
Subject: [PATCH 01/19] Enable aarch64 tket wheel builds on linux

---
 .github/workflows/python-wheels.yml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/python-wheels.yml b/.github/workflows/python-wheels.yml
index a5028a276..dcfca4d2d 100644
--- a/.github/workflows/python-wheels.yml
+++ b/.github/workflows/python-wheels.yml
@@ -75,15 +75,12 @@ jobs:
         # Since we have it as a dependency, wheels built for other platforms will be unusable.
         platform:
           # ---------------- Linux
-          # aarch64 cross-compilation with maturin was causing linking issues
-          # (it doesn't seem to be using zig even though we set --zig)
-          # so it's temporarily disabled
-          #- runner: ubuntu-24.04
-          #  target: aarch64-unknown-linux-gnu
-          #  manylinux: "manylinux2014"
-          #- runner: ubuntu-24.04
-          #  target: aarch64-unknown-linux-musl
-          #  manylinux: "musllinux_1_2"
+          - runner: ubuntu-24.04-arm
+            target: aarch64-unknown-linux-gnu
+            manylinux: "manylinux2014"
+          - runner: ubuntu-24.04-arm
+            target: aarch64-unknown-linux-musl
+            manylinux: "musllinux_1_2"
           - runner: ubuntu-24.04
             target: x86_64-unknown-linux-gnu
             manylinux: "manylinux2014"

From 7bc1dca2c4656f8bd3e9ba1adfe4d009c689fc0e Mon Sep 17 00:00:00 2001
From: Jake Arkinstall <65358059+jake-arkinstall@users.noreply.github.com>
Date: Fri, 21 Nov 2025 12:57:04 +0000
Subject: [PATCH 02/19] Add constrained builds for tket-c-api

---
 .github/actions/tket-c-api/action.yml  | 220 ++-----------------------
 .github/workflows/python-wheels.yml    |  27 ++-
 tket1-passes/scripts/build.sh          |  49 ++++++
 tket1-passes/scripts/build/linux.sh    |  63 +++++++
 tket1-passes/scripts/build/macos.sh    |  35 ++++
 tket1-passes/scripts/build/windows.ps1 |  30 ++++
 6 files changed, 208 insertions(+), 216 deletions(-)
 create mode 100755 tket1-passes/scripts/build.sh
 create mode 100755 tket1-passes/scripts/build/linux.sh
 create mode 100755 tket1-passes/scripts/build/macos.sh
 create mode 100755 tket1-passes/scripts/build/windows.ps1

diff --git a/.github/actions/tket-c-api/action.yml b/.github/actions/tket-c-api/action.yml
index 4be30167d..5f75d08df 100644
--- a/.github/actions/tket-c-api/action.yml
+++ b/.github/actions/tket-c-api/action.yml
@@ -6,227 +6,31 @@ inputs:
     description: "Path where the tket-c-api library will be installed"
     required: true
   target:
-    description: "Target platform, used for caching"
+    description: "Target platform"
     required: false
     default: ${{ runner.arch }}
+  compatibility:
+    description: "Generic compatibility, e.g. 'manylinux_2_28' on linux or '11.0' on macos."
+    required: false
+    default: 'N/A'
 runs:
   using: composite
   steps:
     - name: Attempt to retrieve cached tket-c-api
-      uses: actions/cache/restore@v4
+      uses: actions/cache@v4
       id: cache
       with:
         path: ${{ inputs.install-path }}
-        key: ${{ runner.os }}-${{ inputs.target }}-${{ hashFiles('tket1-passes/conanfile.txt') }}-${{ hashFiles('tket1-passes/conan-profiles/**') }}-${{ hashFiles('.github/actions/tket-c-api/action.yml') }}
-
-    - name: Install conan
-      if: steps.cache.outputs.cache-hit != 'true'
-      uses: conan-io/setup-conan@v1
-      with:
-        cache_packages: true
-
-    - name: Set up conan remote
-      if: steps.cache.outputs.cache-hit != 'true'
-      shell: bash
-      run: |
-        conan remote add tket-libs https://quantinuumsw.jfrog.io/artifactory/api/conan/tket1-libs --index 0
+        key: ${{ runner.os }}-${{ inputs.target }}-${{ hashFiles('tket1-passes/conanfile.txt') }}-${{ hashFiles('tket1-passes/scripts/build.sh') }}-${{ hashFiles('tket1-passes/scripts/build/${{ inputs.target }}.sh') }}-${{ hashFiles('.github/actions/tket-c-api/action.yml') }}
 
-    - name: Install cross-compilation toolchains
+    - name: Run install script
       if: steps.cache.outputs.cache-hit != 'true'
       shell: bash
       run: |
-        TARGET="${{ inputs.target }}"
-
-        # Install cross-compilation toolchains based on target
-        case "$TARGET" in
-          aarch64-unknown-linux-gnu|aarch64-unknown-linux-musl)
-            sudo apt-get update
-            sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
-            ;;
-          armv7-unknown-linux-gnueabihf|armv7-unknown-linux-musleabihf)
-            sudo apt-get update
-            sudo apt-get install -y gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf
-            ;;
-          i686-unknown-linux-gnu|i686-unknown-linux-musl)
-            sudo apt-get update
-            sudo apt-get install -y gcc-multilib g++-multilib
-            ;;
-          x86_64-unknown-linux-gnu|x86_64-unknown-linux-musl)
-            # Native compilation, no cross-compiler needed
-            ;;
-          *)
-            # For other targets, check if cross-compilation is needed
-            if [[ "$TARGET" == *"linux"* ]] && [[ "$TARGET" != *"x86_64"* ]]; then
-              echo "Warning: Unknown Linux target $TARGET, cross-compilation may fail"
-            fi
-            ;;
-        esac
-
-    - name: Determine conan profile
-      if: steps.cache.outputs.cache-hit != 'true'
-      id: conan-profile
-      shell: bash
-      run: |
-        TARGET="${{ inputs.target }}"
-        PROFILE=""
-
-        case "$TARGET" in
-          aarch64-unknown-linux-gnu)
-            PROFILE="linux-armv8-gcc14"
-            ;;
-          aarch64-unknown-linux-musl)
-            PROFILE="linux-armv8-gcc14"
-            ;;
-          armv7-unknown-linux-gnueabihf)
-            PROFILE="linux-armv7-gcc14"
-            ;;
-          armv7-unknown-linux-musleabihf)
-            PROFILE="linux-armv7-gcc14"
-            ;;
-          i686-unknown-linux-gnu)
-            PROFILE="linux-i686-gcc14"
-            ;;
-          i686-unknown-linux-musl)
-            PROFILE="linux-i686-gcc14"
-            ;;
-          x86_64-unknown-linux-gnu)
-            PROFILE="linux-x86_64-gcc14"
-            ;;
-          x86_64-unknown-linux-musl)
-            PROFILE="linux-x86_64-gcc14"
-            ;;
-          x86_64-pc-windows-msvc)
-            PROFILE="windows-2025"
-            ;;
-          *)
-            # For non-Linux targets or if no match, let conan generate a default profile
-            if [[ "$TARGET" == *"apple"* ]] && [[ "$TARGET" == *"aarch64"* ]]; then
-              PROFILE="macos-15"
-            elif [[ "$TARGET" == *"apple"* ]] && [[ "$TARGET" == *"x86_64"* ]]; then
-              PROFILE="macos-15-intel"
-            elif [[ "$TARGET" == *"windows"* ]] && [[ "$TARGET" == *"msvc"* ]]; then
-              PROFILE="windows-2025"
-            elif [[ "$TARGET" == *"armv8"* ]] || [[ "$TARGET" == *"aarch64"* ]]; then
-              PROFILE="linux-armv8-gcc14"
-            elif [[ "$TARGET" == *"x86_64"* ]]; then
-              PROFILE="linux-x86_64-gcc14"
-            else
-              PROFILE=""
-            fi
-            ;;
-        esac
-
-        if [ -z "$PROFILE" ]; then
-          echo "No profile found for target: $TARGET, using default"
-          echo "profile=" >> $GITHUB_OUTPUT
-          echo "use_profile=false" >> $GITHUB_OUTPUT
-        else
-          # Check if profile exists in tket1-passes/conan-profiles directory
-          if [ -f "tket1-passes/conan-profiles/$PROFILE" ]; then
-            PROFILE_PATH="tket1-passes/conan-profiles/$PROFILE"
-            echo "profile=$PROFILE_PATH" >> $GITHUB_OUTPUT
-            echo "use_profile=true" >> $GITHUB_OUTPUT
-            echo "Selected profile: $PROFILE_PATH"
-          else
-            echo "Profile $PROFILE not found in tket1-passes/conan-profiles/, using default"
-            echo "profile=" >> $GITHUB_OUTPUT
-            echo "use_profile=false" >> $GITHUB_OUTPUT
-          fi
-        fi
-
-    - name: Build and install tket-c-api
-      if: steps.cache.outputs.cache-hit != 'true' && runner.os != 'Windows'
-      shell: bash
-      run: |
-        cd tket1-passes
-        mkdir -p ${{ inputs.install-path }}
-
-        # Set up cross-compilation environment variables if needed
-        TARGET="${{ inputs.target }}"
-        export CC=""
-        export CXX=""
-
-        case "$TARGET" in
-          aarch64-unknown-linux-gnu|aarch64-unknown-linux-musl)
-            export CC="aarch64-linux-gnu-gcc"
-            export CXX="aarch64-linux-gnu-g++"
-            ;;
-          armv7-unknown-linux-gnueabihf|armv7-unknown-linux-musleabihf)
-            export CC="arm-linux-gnueabihf-gcc"
-            export CXX="arm-linux-gnueabihf-g++"
-            ;;
-          i686-unknown-linux-gnu|i686-unknown-linux-musl)
-            # For i686, conan profile with arch=x86 should handle -m32 automatically
-            # No need to set CC/CXX explicitly
-            ;;
-        esac
-
-        if [ -n "$CC" ]; then
-          echo "Using cross-compiler: CC=$CC, CXX=$CXX"
-          # Verify cross-compiler is available and working
-          $CC --version || echo "Warning: Failed to get $CC version"
-        fi
-
-        # Build conan install command
-        CONAN_CMD="conan install . --build=missing --options=\"tket-c-api/*:shared=True\""
-
-        if [ "${{ steps.conan-profile.outputs.use_profile }}" == "true" ]; then
-          CONAN_CMD="$CONAN_CMD --profile=${{ github.workspace }}/${{ steps.conan-profile.outputs.profile }}"
-          echo "Using profile: ${{ steps.conan-profile.outputs.profile }}"
-        else
-          echo "Using default conan profile"
-        fi
-
-        CONAN_CMD="$CONAN_CMD --format=json"
-        echo "Running: $CONAN_CMD"
-
-        CONAN_OUTPUT=$(eval $CONAN_CMD)
-        CONAN_LIB_FOLDER=$(echo "$CONAN_OUTPUT" | jq -r ".graph.nodes.\"1\".package_folder")
-        echo "CONAN_LIB_FOLDER: $CONAN_LIB_FOLDER"
-        cp -r "$CONAN_LIB_FOLDER/"* "${{ inputs.install-path }}/"
-
-    - name: Build and install tket-c-api (Windows)
-      if: steps.cache.outputs.cache-hit != 'true' && runner.os == 'Windows'
-      shell: pwsh
-      run: |
-        Set-Location tket1-passes
-        New-Item -ItemType Directory -Force -Path "${{ inputs.install-path }}" | Out-Null
-
-        # Build conan install command
-        $conanCmd = "conan install . --build=missing --options=`"tket-c-api/*:shared=True`""
-
-        if ("${{ steps.conan-profile.outputs.use_profile }}" -eq "true") {
-          $profilePath = "${{ github.workspace }}/${{ steps.conan-profile.outputs.profile }}"
-          $conanCmd = "$conanCmd --profile=$profilePath"
-          Write-Host "Using profile: $profilePath"
-        } else {
-          Write-Host "Using default conan profile"
-        }
-
-        Write-Host "CMake option CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON will be passed to the build"
-
-        $conanCmd = "$conanCmd --format=json"
-        Write-Host "Running: $conanCmd"
-
-        $conanOutput = Invoke-Expression $conanCmd
-        $conanJson = $conanOutput | ConvertFrom-Json
-        $conanLibFolder = $conanJson.graph.nodes.'1'.package_folder
-
-        Write-Host "CONAN_LIB_FOLDER: $conanLibFolder"
-        Write-Host "Files in CONAN_LIB_FOLDER:"
-
-        # Copy the built library files to the install path
-        Get-ChildItem -Path "$conanLibFolder" -Recurse -File | ForEach-Object { Write-Output $_.FullName }
-        Copy-Item -Recurse -Force -Path "$conanLibFolder\*" -Destination "${{ inputs.install-path }}"
-        Write-Host "tket-c-api library files:"
-        Get-ChildItem -Path "${{ inputs.install-path }}" -Recurse -File | ForEach-Object { Write-Output $_.FullName }
-
-    - name: Upload compiled library to cache
-      if: steps.cache.outputs.cache-hit != 'true'
-      uses: actions/cache/save@v4
-      with:
-        path: ${{ inputs.install-path }}
-        key: ${{ steps.cache.outputs.cache-primary-key }}
+        tket1-passes/scripts/build.sh \
+          "${{ inputs.target }}" \
+          "${{ inputs.compatibility }}" \
+          "${{ inputs.install-path }}"
 
     - name: List tket-c-api library files
       shell: bash
diff --git a/.github/workflows/python-wheels.yml b/.github/workflows/python-wheels.yml
index dcfca4d2d..cefe52429 100644
--- a/.github/workflows/python-wheels.yml
+++ b/.github/workflows/python-wheels.yml
@@ -77,30 +77,35 @@ jobs:
           # ---------------- Linux
           - runner: ubuntu-24.04-arm
             target: aarch64-unknown-linux-gnu
-            manylinux: "manylinux2014"
+            compatibility: manylinux_2_28
+            test-wheels: true
           - runner: ubuntu-24.04-arm
             target: aarch64-unknown-linux-musl
-            manylinux: "musllinux_1_2"
+            compatibility: musllinux_1_2
+            test-wheels: true
           - runner: ubuntu-24.04
             target: x86_64-unknown-linux-gnu
-            manylinux: "manylinux2014"
+            compatibility: manylinux_2_28
             test-wheels: true
           - runner: ubuntu-24.04
             target: x86_64-unknown-linux-musl
-            manylinux: "musllinux_1_2"
+            compatibility: musllinux_1_2
+            test-wheels: true
           # ---------------- Mac
           - runner: macos-14
             target: aarch64-apple-darwin
             test-wheels: true
-            macos-compatibility: "13.0"
+            compatibility: "13.0"
           - runner: macos-15-intel
             target: x86_64-apple-darwin
             test-wheels: true
-            macos-compatibility: "15.0"
+            compatibility: "15.0"
           # ---------------- Windows
           - runner: windows-2025
             target: x86_64-pc-windows-msvc
+            compatibility: msvc
             test-wheels: true
+
     steps:
       - uses: actions/checkout@v5
       - uses: mozilla-actions/sccache-action@v0.0.9
@@ -113,6 +118,7 @@ jobs:
         with:
           version: ${{ env.UV_VERSION }}
           enable-cache: true
+
       - name: Install LLVM and Clang
         uses: KyleMayes/install-llvm-action@v2
         with:
@@ -142,7 +148,7 @@ jobs:
               echo "TKET_C_API_PATH=$WORKSPACE/tket-c-api" >> $GITHUB_ENV
               echo "$WORKSPACE/tket-c-api/lib" >> $GITHUB_PATH
               echo "DYLD_LIBRARY_PATH=$WORKSPACE/tket-c-api/lib" >> $GITHUB_ENV
-              echo "MACOSX_DEPLOYMENT_TARGET=${{ matrix.platform.macos-compatibility }}" >> $GITHUB_ENV
+              echo "MACOSX_DEPLOYMENT_TARGET=${{ matrix.platform.compatibility }}" >> $GITHUB_ENV
               ;;
             Linux)
               echo "tket_c_api_path=$WORKSPACE/tket-c-api" >> $GITHUB_OUTPUT
@@ -156,15 +162,17 @@ jobs:
         with:
           install-path: ${{ steps.tket-paths.outputs.tket_c_api_path }}
           target: ${{ matrix.platform.target }}
+          compatibility: ${{ matrix.platform.compatibility }}
 
       - uses: mlugg/setup-zig@v2
         if: ${{ matrix.platform.manylinux }}
 
       - name: Set compatibility flag
         id: compatibility-flag
+        if: ${{ matrix.platform.
         shell: bash
         run: |
-          if [ -n "${{ matrix.platform.manylinux }}" ]; then
+          if [ "${{ matrix.platform.compatibility }}" == *"linux"* ]; then
             WITH_ZIG_FLAG="--with ziglang --with maturin[zig]"
             COMPATIBILITY_FLAG="--compatibility ${{ matrix.platform.manylinux }} --zig"
           else
@@ -240,6 +248,7 @@ jobs:
             ${{ steps.compatibility-flag.outputs.WITH_ZIG_FLAG }} \
             maturin build \
             ${{ steps.compatibility-flag.outputs.COMPATIBILITY_FLAG }} \
+            --auditwheel=repair
             --release \
             --out ../dist \
             --target ${{ matrix.platform.target }} \
@@ -264,6 +273,8 @@ jobs:
           echo "Repaired wheels:"
           ls -lh dist/*macosx*.whl
 
+      - name: Repair linux wheels with rep
+
       - name: Upload wheels
         uses: actions/upload-artifact@v5
         with:
diff --git a/tket1-passes/scripts/build.sh b/tket1-passes/scripts/build.sh
new file mode 100755
index 000000000..5234e54da
--- /dev/null
+++ b/tket1-passes/scripts/build.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+set -eou pipefail
+if [ "$#" -ne 3 ]; then
+    echo "Usage: $0 <target> <compatibility> <output_dir>"
+    echo "Examples:"
+    echo "   $0 x86_64-unknown-linux-gnu manylinux_2_28_x86_64 ./out"
+    echo "   $0 aarch64-apple-darwin 14.0 ./out"
+    echo "   $0 x86_64-pc-windows-msvc msvc ./out"
+    exit 1
+fi
+
+target="$1"
+compatibility="$2"
+output_dir="$3"
+
+if [ ! -d "${output_dir}" ]; then
+    echo "Output directory ${output_dir} does not exist. Creating it."
+    mkdir -p "${output_dir}"
+fi
+
+# For linux builds use docker containers for compatibility
+case "${target}" in
+    *"linux"*)
+        echo "Building tket-c-api in a ${compatibility} container..."
+        # We mount the tket1-passes directory as read-only to prevent
+        # temporary files from being written to it by conan.
+        #
+        # The output directory is mounted to /out in the container,
+        # and is writable.
+        docker run -i \
+            -v "$(dirname "$0")/../":/tket1-passes:ro \
+            -v "${output_dir}":/out \
+            quay.io/pypa/${compatibility}:latest \
+            /bin/bash /tket1-passes/scripts/build/linux.sh /out
+    ;;
+    *"apple-darwin")
+        echo "Building tket-c-api with MACOSX_DEPLOYMENT_TARGET=${compatibility}..."
+        MACOSX_DEPLOYMENT_TARGET="${compatibility}" \
+          bash -c "$(dirname "$0")/build/macos.sh ${output_dir}"
+    ;;
+    *"windows-msvc")
+        echo "Building tket-c-api for Windows with MSVC..." 
+        pwsh -File "$(dirname "$0")"/build/windows.sh ${output_dir}
+    ;;
+    *)
+      echo "Unsupported target: ${target}"
+      exit 1
+    ;;
+esac
diff --git a/tket1-passes/scripts/build/linux.sh b/tket1-passes/scripts/build/linux.sh
new file mode 100755
index 000000000..a1305f03e
--- /dev/null
+++ b/tket1-passes/scripts/build/linux.sh
@@ -0,0 +1,63 @@
+#!/bin/bash
+set -eou pipefail
+
+# Build script for linux targets, designed specifically for
+# use within manylinux_2_28 and musllinux_1_2 containers on
+# x86_64 and aarch64 architectures.
+#
+# Note that different container images may have access to
+# different tooling, package managers, etc. We assume
+# pipx is available. jq is installed from github releases
+# if not already present.
+
+output_dir="$1"
+if [ -z "${output_dir}" ]; then
+  echo "Usage: $0 <output_dir>"
+  exit 1
+fi;
+
+if ! command -v jq &> /dev/null; then
+    # if uname -m is x86_64, download arm64 version of jq and use the corresponding hash
+    # if uname -m is aarch64, download aarch64 version of jq and use the corresponding hash
+    case "$(uname -m)" in
+        "aarch64")
+            jq_filename="jq-linux-arm64";
+            jq_sha256="6bc62f25981328edd3cfcfe6fe51b073f2d7e7710d7ef7fcdac28d4e384fc3d4";
+        ;;
+        "x86_64")
+            jq_filename="jq-linux-amd64";
+            jq_sha256="020468de7539ce70ef1bceaf7cde2e8c4f2ca6c3afb84642aabc5c97d9fc2a0d"
+        ;;
+        *)
+            echo "Unsupported architecture: $(uname -m)"
+            exit 1
+        ;;
+    esac
+    echo "jq not found. Downloading..."
+    curl -LO https://github.com/jqlang/jq/releases/download/jq-1.8.1/${jq_filename}
+    echo "Verifying jq checksum..."
+    echo "${jq_sha256}  ${jq_filename}" | sha256sum -c
+    chmod +x ${jq_filename}
+    echo "Installing jq..."
+    mv ${jq_filename} /usr/bin/jq
+    echo "jq installed successfully."
+fi
+
+# Install and run conan
+pipx install conan
+conan profile detect
+conan remote add tket-libs https://quantinuumsw.jfrog.io/artifactory/api/conan/tket1-libs --index 0
+conan install /tket1-passes \
+  --build=missing \
+  --options="tket-c-api/*:shared=True" \
+  --format=json \
+  --output-folder=/tmp/conan_output \
+  --out-file=/tmp/conanbuild.json
+
+# Extract the library folder path from the conan JSON output, and
+# copy the built artifacts to the host tket1-passes/out directory
+lib_folder=$(jq -r '.graph.nodes."1".package_folder' /tmp/conanbuild.json)
+echo "Installation folder: ${lib_folder}"
+chmod -R a+r "${lib_folder}"
+echo "Copying built artifacts to output directory: ${output_dir}"
+cp -r "${lib_folder}"/* "${output_dir}"
diff --git a/tket1-passes/scripts/build/macos.sh b/tket1-passes/scripts/build/macos.sh
new file mode 100755
index 000000000..335a7293c
--- /dev/null
+++ b/tket1-passes/scripts/build/macos.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+set -eou pipefail
+
+# Build script for macOS targets. A MACOSX_DEPLOYMENT_TARGET must
+# be set in the environment before calling this script.
+
+if [ "$#" -ne 1 ]; then
+  echo "Usage: $0 <output_dir>"
+  exit 1
+fi
+
+output_dir="$1"
+
+echo "Building tket-c-api on aarch64-apple-darwin with MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET}..."
+
+cd "$(dirname "$0")/"../../
+
+brew install --cask jq
+pipx install conan
+
+# Install and run conan
+pipx install conan
+conan profile detect
+conan remote add tket-libs https://quantinuumsw.jfrog.io/artifactory/api/conan/tket1-libs --index 0
+conan install tket1-passes \
+  --build=missing \
+  --options="tket-c-api/*:shared=True" \
+  --format=json \
+  --output-folder=/tmp/conan_output \
+  --out-file=/tmp/conanbuild.json
+
+# Extract the library folder path from the conan JSON output, and
+# copy the built artifacts to tket1-passes/out
+lib_folder=$(jq -r '.graph.nodes."1".package_folder' /tmp/conanbuild.json)
+cp -r "${lib_folder}"/* "${output_dir}"
diff --git a/tket1-passes/scripts/build/windows.ps1 b/tket1-passes/scripts/build/windows.ps1
new file mode 100755
index 000000000..14f16567b
--- /dev/null
+++ b/tket1-passes/scripts/build/windows.ps1
@@ -0,0 +1,30 @@
+$ErrorActionPreference = "Stop"
+Set-StrictMode -Version Latest
+
+param (
+    [Parameter(Mandatory = $true)]
+    [string]$OutputDir
+)
+
+Set-Location (Join-Path $PSScriptRoot "..\..\")
+
+choco install jq -y
+pipx install conan
+conan profile detect
+conan remote add tket-libs `
+    "https://quantinuumsw.jfrog.io/artifactory/api/conan/tket1-libs" `
+    --index 0
+
+# Run install and capture JSON output
+$tmp = New-TemporaryFile
+conan install tket1-passes `
+    --build=missing `
+    --options="tket-c-api/*:shared=True" `
+    --format=json |
+    Out-File -Encoding UTF8 $tmp
+
+$libFolder = jq -r '.graph.nodes."1".package_folder' $tmp
+
+Copy-Item -Recurse -Force `
+    (Join-Path $libFolder "*") `
+    $OutputDir

From 0db1e1088145e7f9a8b958db55946d02f17450f7 Mon Sep 17 00:00:00 2001
From: Jake Arkinstall <65358059+jake-arkinstall@users.noreply.github.com>
Date: Fri, 21 Nov 2025 13:04:32 +0000
Subject: [PATCH 03/19] Update tket-c-api inputs for other jobs

---
 .github/workflows/build_docs.yml     |  2 ++
 .github/workflows/ci.yml             | 18 ++++++++++++++++++
 .github/workflows/release-checks.yml |  2 ++
 .github/workflows/semver-checks.yml  |  2 ++
 4 files changed, 24 insertions(+)

diff --git a/.github/workflows/build_docs.yml b/.github/workflows/build_docs.yml
index 86cc23d25..1c49b1ebd 100644
--- a/.github/workflows/build_docs.yml
+++ b/.github/workflows/build_docs.yml
@@ -55,6 +55,8 @@ jobs:
         uses: ./.github/actions/tket-c-api
         with:
           install-path: ${{ env.TKET_C_API_PATH }}
+          target: x86_64-unknown-linux-gnu
+          compatibility: manylinux_2_28
 
       - name: Install uv
         uses: astral-sh/setup-uv@v7
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 21f792c62..0fbde7845 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -73,6 +73,8 @@ jobs:
         uses: ./.github/actions/tket-c-api
         with:
           install-path: ${{ env.TKET_C_API_PATH }}
+          target: x86_64-unknown-linux-gnu
+          compatibility: manylinux_2_28
       - name: Check formatting
         run: cargo fmt -- --check
       - name: Install LLVM and Clang
@@ -103,6 +105,8 @@ jobs:
         uses: ./.github/actions/tket-c-api
         with:
           install-path: ${{ env.TKET_C_API_PATH }}
+          target: x86_64-unknown-linux-gnu
+          compatibility: manylinux_2_28
       - name: Install Python ${{ env.PYTHON_HIGHEST }}
         run: uv python install ${{ env.PYTHON_HIGHEST }}
       - name: Setup dependencies
@@ -130,6 +134,8 @@ jobs:
         uses: ./.github/actions/tket-c-api
         with:
           install-path: ${{ env.TKET_C_API_PATH }}
+          target: x86_64-unknown-linux-gnu
+          compatibility: manylinux_2_28
       - uses: cargo-bins/cargo-binstall@main
       - name: Install cargo-codspeed
         run: cargo binstall cargo-codspeed --force
@@ -163,6 +169,8 @@ jobs:
         uses: ./.github/actions/tket-c-api
         with:
           install-path: ${{ env.TKET_C_API_PATH }}
+          target: x86_64-unknown-linux-gnu
+          compatibility: manylinux_2_28
       - uses: taiki-e/install-action@nextest
       - name: Build with no features
         run: cargo nextest r --verbose -p tket -p tket-py -p tket-qsystem --no-default-features --no-run
@@ -192,6 +200,8 @@ jobs:
         uses: ./.github/actions/tket-c-api
         with:
           install-path: ${{ env.TKET_C_API_PATH }}
+          target: x86_64-unknown-linux-gnu
+          compatibility: manylinux_2_28
       - uses: taiki-e/install-action@nextest
       - name: Build with all features
         run: cargo nextest r --verbose --workspace --all-features --no-run
@@ -226,6 +236,8 @@ jobs:
         uses: ./.github/actions/tket-c-api
         with:
           install-path: ${{ env.TKET_C_API_PATH }}
+          target: x86_64-unknown-linux-gnu
+          compatibility: manylinux_2_28
       - name: Configure default rust toolchain
         run: rustup override set ${{steps.toolchain.outputs.name}}
       - uses: taiki-e/install-action@nextest
@@ -260,6 +272,8 @@ jobs:
         uses: ./.github/actions/tket-c-api
         with:
           install-path: ${{ env.TKET_C_API_PATH }}
+          target: x86_64-unknown-linux-gnu
+          compatibility: manylinux_2_28
       - name: Install cargo-llvm-cov
         uses: taiki-e/install-action@cargo-llvm-cov
       - name: Run tests with coverage instrumentation
@@ -307,6 +321,8 @@ jobs:
         uses: ./.github/actions/tket-c-api
         with:
           install-path: ${{ env.TKET_C_API_PATH }}
+          target: x86_64-unknown-linux-gnu
+          compatibility: manylinux_2_28
       - uses: cargo-bins/cargo-binstall@main
       - name: Install cargo-minimal-versions
         run: |
@@ -348,6 +364,8 @@ jobs:
         uses: ./.github/actions/tket-c-api
         with:
           install-path: ${{ env.TKET_C_API_PATH }}
+          target: x86_64-unknown-linux-gnu
+          compatibility: manylinux_2_28
       - name: Install Python ${{ env.PYTHON_LOWEST }}
         run: uv python install ${{ env.PYTHON_LOWEST }}
       - name: Setup dependencies
diff --git a/.github/workflows/release-checks.yml b/.github/workflows/release-checks.yml
index 74a7a6689..00d8dcb9c 100644
--- a/.github/workflows/release-checks.yml
+++ b/.github/workflows/release-checks.yml
@@ -47,6 +47,8 @@ jobs:
         uses: ./.github/actions/tket-c-api
         with:
           install-path: ${{ env.TKET_C_API_PATH }}
+          target: x86_64-unknown-linux-gnu
+          compatibility: manylinux_2_28
       - name: Set up uv
         uses: astral-sh/setup-uv@v7
         with:
diff --git a/.github/workflows/semver-checks.yml b/.github/workflows/semver-checks.yml
index cdd4f1786..6bd503f7e 100644
--- a/.github/workflows/semver-checks.yml
+++ b/.github/workflows/semver-checks.yml
@@ -38,6 +38,8 @@ jobs:
         uses: ./.github/actions/tket-c-api
         with:
           install-path: ${{ env.TKET_C_API_PATH }}
+          target: x86_64-unknown-linux-gnu
+          compatibility: manylinux_2_28
       - name: Install LLVM from apt
         run: |
           echo "Installing apt dependencies: llvm-14"

From b0c58263e3a494220a2ac102ff868b04f4a1c5a2 Mon Sep 17 00:00:00 2001
From: Jake Arkinstall <65358059+jake-arkinstall@users.noreply.github.com>
Date: Fri, 21 Nov 2025 13:12:36 +0000
Subject: [PATCH 04/19] Remove partial line in python-wheels.yml, fix absolute
 paths in build.sh

---
 .github/workflows/python-wheels.yml | 1 -
 tket1-passes/scripts/build.sh       | 9 +++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/python-wheels.yml b/.github/workflows/python-wheels.yml
index cefe52429..4dc567084 100644
--- a/.github/workflows/python-wheels.yml
+++ b/.github/workflows/python-wheels.yml
@@ -169,7 +169,6 @@ jobs:
 
       - name: Set compatibility flag
         id: compatibility-flag
-        if: ${{ matrix.platform.
         shell: bash
         run: |
           if [ "${{ matrix.platform.compatibility }}" == *"linux"* ]; then
diff --git a/tket1-passes/scripts/build.sh b/tket1-passes/scripts/build.sh
index 5234e54da..146831a11 100755
--- a/tket1-passes/scripts/build.sh
+++ b/tket1-passes/scripts/build.sh
@@ -17,6 +17,7 @@ if [ ! -d "${output_dir}" ]; then
     echo "Output directory ${output_dir} does not exist. Creating it."
     mkdir -p "${output_dir}"
 fi
+output_abs="$(realpath "${output_dir}")"
 
 # For linux builds use docker containers for compatibility
 case "${target}" in
@@ -28,19 +29,19 @@ case "${target}" in
         # The output directory is mounted to /out in the container,
         # and is writable.
         docker run -i \
-            -v "$(dirname "$0")/../":/tket1-passes:ro \
-            -v "${output_dir}":/out \
+            -v "$(realpath $(dirname "$0")/../)":/tket1-passes:ro \
+            -v "${output_abs}":/out \
             quay.io/pypa/${compatibility}:latest \
             /bin/bash /tket1-passes/scripts/build/linux.sh /out
     ;;
     *"apple-darwin")
         echo "Building tket-c-api with MACOSX_DEPLOYMENT_TARGET=${compatibility}..."
         MACOSX_DEPLOYMENT_TARGET="${compatibility}" \
-          bash -c "$(dirname "$0")/build/macos.sh ${output_dir}"
+          bash -c "$(dirname "$0")/build/macos.sh ${output_abs}"
     ;;
     *"windows-msvc")
         echo "Building tket-c-api for Windows with MSVC..." 
-        pwsh -File "$(dirname "$0")"/build/windows.sh ${output_dir}
+        pwsh -File "$(dirname "$0")"/build/windows.sh ${output_abs}
     ;;
     *)
       echo "Unsupported target: ${target}"

From 300744f38743cfa4ea18654fe442ebd6d941ca22 Mon Sep 17 00:00:00 2001
From: Jake Arkinstall <65358059+jake-arkinstall@users.noreply.github.com>
Date: Fri, 21 Nov 2025 13:13:25 +0000
Subject: [PATCH 05/19] Remove partial step in python-wheels.yml

---
 .github/workflows/python-wheels.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/python-wheels.yml b/.github/workflows/python-wheels.yml
index 4dc567084..f8ae44d93 100644
--- a/.github/workflows/python-wheels.yml
+++ b/.github/workflows/python-wheels.yml
@@ -272,8 +272,6 @@ jobs:
           echo "Repaired wheels:"
           ls -lh dist/*macosx*.whl
 
-      - name: Repair linux wheels with rep
-
       - name: Upload wheels
         uses: actions/upload-artifact@v5
         with:

From be6a1f759f1cd504659c31813eb0fd65ff52af34 Mon Sep 17 00:00:00 2001
From: Jake Arkinstall <65358059+jake-arkinstall@users.noreply.github.com>
Date: Fri, 21 Nov 2025 13:35:48 +0000
Subject: [PATCH 06/19] brew install jq (non-cask)

---
 tket1-passes/scripts/build/macos.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tket1-passes/scripts/build/macos.sh b/tket1-passes/scripts/build/macos.sh
index 335a7293c..687bf8e26 100755
--- a/tket1-passes/scripts/build/macos.sh
+++ b/tket1-passes/scripts/build/macos.sh
@@ -15,7 +15,7 @@ echo "Building tket-c-api on aarch64-apple-darwin with MACOSX_DEPLOYMENT_TARGET=
 
 cd "$(dirname "$0")/"../../
 
-brew install --cask jq
+brew install jq
 pipx install conan
 
 # Install and run conan

From 841f143f0a7eafed2a62ef3f560f7a58e63b132f Mon Sep 17 00:00:00 2001
From: Jake Arkinstall <65358059+jake-arkinstall@users.noreply.github.com>
Date: Fri, 21 Nov 2025 14:00:11 +0000
Subject: [PATCH 07/19] Other fixes

---
 .github/workflows/python-wheels.yml | 4 ++--
 tket1-passes/scripts/build.sh       | 2 +-
 tket1-passes/scripts/build/macos.sh | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/python-wheels.yml b/.github/workflows/python-wheels.yml
index f8ae44d93..f7f7c15d4 100644
--- a/.github/workflows/python-wheels.yml
+++ b/.github/workflows/python-wheels.yml
@@ -171,9 +171,9 @@ jobs:
         id: compatibility-flag
         shell: bash
         run: |
-          if [ "${{ matrix.platform.compatibility }}" == *"linux"* ]; then
+          if [ "${{ matrix.platform.target }}" == *"linux"* ]; then
             WITH_ZIG_FLAG="--with ziglang --with maturin[zig]"
-            COMPATIBILITY_FLAG="--compatibility ${{ matrix.platform.manylinux }} --zig"
+            COMPATIBILITY_FLAG="--compatibility ${{ matrix.platform.compatibility }} --zig"
           else
             WITH_ZIG_FLAG=""
             COMPATIBILITY_FLAG=""
diff --git a/tket1-passes/scripts/build.sh b/tket1-passes/scripts/build.sh
index 146831a11..17450d89a 100755
--- a/tket1-passes/scripts/build.sh
+++ b/tket1-passes/scripts/build.sh
@@ -41,7 +41,7 @@ case "${target}" in
     ;;
     *"windows-msvc")
         echo "Building tket-c-api for Windows with MSVC..." 
-        pwsh -File "$(dirname "$0")"/build/windows.sh ${output_abs}
+        pwsh -File "$(dirname "$0")"/build/windows.ps1 ${output_abs}
     ;;
     *)
       echo "Unsupported target: ${target}"
diff --git a/tket1-passes/scripts/build/macos.sh b/tket1-passes/scripts/build/macos.sh
index 687bf8e26..321a4b67c 100755
--- a/tket1-passes/scripts/build/macos.sh
+++ b/tket1-passes/scripts/build/macos.sh
@@ -16,7 +16,6 @@ echo "Building tket-c-api on aarch64-apple-darwin with MACOSX_DEPLOYMENT_TARGET=
 cd "$(dirname "$0")/"../../
 
 brew install jq
-pipx install conan
 
 # Install and run conan
 pipx install conan

From 495ad557d98bd9d48c4ac010927721fec7dfc9af Mon Sep 17 00:00:00 2001
From: Jake Arkinstall <65358059+jake-arkinstall@users.noreply.github.com>
Date: Fri, 21 Nov 2025 14:06:27 +0000
Subject: [PATCH 08/19] Further fixes

---
 .github/workflows/python-wheels.yml | 31 +++++++++--------------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/python-wheels.yml b/.github/workflows/python-wheels.yml
index f7f7c15d4..ef97dba5c 100644
--- a/.github/workflows/python-wheels.yml
+++ b/.github/workflows/python-wheels.yml
@@ -65,46 +65,35 @@ jobs:
         # Each entry defines:
         # - runner: The github runner to use for the build.
         # - target: The target platform used when building the rust code.
-        # - manylinux: (optional) If doing manylinux-compatible wheels,
-        #    the manylinux version to use. Setting this option causes the wheels
-        #    to be built with zig.
-        # - test-wheels: Whether to test installing the wheels.
-        #    This is only done when the target platform matches the runner platform.
-        #
-        # Note that platform support is limited by the pytket wheels' availability.
-        # Since we have it as a dependency, wheels built for other platforms will be unusable.
+        # - compatibility: target-specific compatibility option, e.g.:
+        #   - manylinux/musllinux for ubuntu
+        #   - MACOSX_DEPLOYMENT_TARGET for macos
+        #   - c library target for windows (currently only msvc supported)
         platform:
           # ---------------- Linux
           - runner: ubuntu-24.04-arm
             target: aarch64-unknown-linux-gnu
             compatibility: manylinux_2_28
-            test-wheels: true
           - runner: ubuntu-24.04-arm
             target: aarch64-unknown-linux-musl
             compatibility: musllinux_1_2
-            test-wheels: true
           - runner: ubuntu-24.04
             target: x86_64-unknown-linux-gnu
             compatibility: manylinux_2_28
-            test-wheels: true
           - runner: ubuntu-24.04
             target: x86_64-unknown-linux-musl
             compatibility: musllinux_1_2
-            test-wheels: true
           # ---------------- Mac
           - runner: macos-14
             target: aarch64-apple-darwin
-            test-wheels: true
             compatibility: "13.0"
           - runner: macos-15-intel
             target: x86_64-apple-darwin
-            test-wheels: true
             compatibility: "15.0"
           # ---------------- Windows
           - runner: windows-2025
             target: x86_64-pc-windows-msvc
             compatibility: msvc
-            test-wheels: true
 
     steps:
       - uses: actions/checkout@v5
@@ -165,7 +154,7 @@ jobs:
           compatibility: ${{ matrix.platform.compatibility }}
 
       - uses: mlugg/setup-zig@v2
-        if: ${{ matrix.platform.manylinux }}
+        if: contains(matrix.platform.target, "linux")
 
       - name: Set compatibility flag
         id: compatibility-flag
@@ -283,12 +272,10 @@ jobs:
         shell: bash
         run: |
           echo "Testing the newly built ${{ matrix.platform.target }} wheels..."
-          if [ "$TEST_INSTALL" = "true" ]; then
-            # Make sure we only use the tket lib from the wheel itself
-            rm -rf $WORKSPACE\tket-c-api\lib
-            rm -rf $WORKSPACE\tket-c-api\bin
-            uv run -f dist --with tket --refresh-package tket --no-project -- python -c "import tket"
-          fi
+          # Make sure we only use the tket lib from the wheel itself
+          rm -rf $WORKSPACE\tket-c-api\lib
+          rm -rf $WORKSPACE\tket-c-api\bin
+          uv run -f dist --with tket --refresh-package tket --no-project -- python -c "import tket"
           uvx twine check --strict dist/*
         env:
           WORKSPACE: ${{ github.workspace }}

From 5ce7cc486881129775504af3d6f9ea4d508a80e6 Mon Sep 17 00:00:00 2001
From: Jake Arkinstall <65358059+jake-arkinstall@users.noreply.github.com>
Date: Fri, 21 Nov 2025 14:10:18 +0000
Subject: [PATCH 09/19] Use single quotes for action if expression

---
 .github/workflows/python-wheels.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-wheels.yml b/.github/workflows/python-wheels.yml
index ef97dba5c..ecb4a813e 100644
--- a/.github/workflows/python-wheels.yml
+++ b/.github/workflows/python-wheels.yml
@@ -154,7 +154,7 @@ jobs:
           compatibility: ${{ matrix.platform.compatibility }}
 
       - uses: mlugg/setup-zig@v2
-        if: contains(matrix.platform.target, "linux")
+        if: contains(matrix.platform.target, 'linux')
 
       - name: Set compatibility flag
         id: compatibility-flag

From 00fc8f6ed81edec0cadca3d787e19b5953b13d3d Mon Sep 17 00:00:00 2001
From: Jake Arkinstall <65358059+jake-arkinstall@users.noreply.github.com>
Date: Fri, 21 Nov 2025 14:20:53 +0000
Subject: [PATCH 10/19] Win and macos build fixes

---
 tket1-passes/scripts/build/macos.sh    | 2 +-
 tket1-passes/scripts/build/windows.ps1 | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tket1-passes/scripts/build/macos.sh b/tket1-passes/scripts/build/macos.sh
index 321a4b67c..9f7a812e0 100755
--- a/tket1-passes/scripts/build/macos.sh
+++ b/tket1-passes/scripts/build/macos.sh
@@ -13,7 +13,7 @@ output_dir="$1"
 
 echo "Building tket-c-api on aarch64-apple-darwin with MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET}..."
 
-cd "$(dirname "$0")/"../../
+cd "$(dirname "$0")/"../../../
 
 brew install jq
 
diff --git a/tket1-passes/scripts/build/windows.ps1 b/tket1-passes/scripts/build/windows.ps1
index 14f16567b..09c40b13f 100755
--- a/tket1-passes/scripts/build/windows.ps1
+++ b/tket1-passes/scripts/build/windows.ps1
@@ -1,12 +1,12 @@
-$ErrorActionPreference = "Stop"
-Set-StrictMode -Version Latest
-
 param (
     [Parameter(Mandatory = $true)]
     [string]$OutputDir
 )
 
-Set-Location (Join-Path $PSScriptRoot "..\..\")
+$ErrorActionPreference = "Stop"
+Set-StrictMode -Version Latest
+
+Set-Location (Join-Path $PSScriptRoot "..\..\..\")
 
 choco install jq -y
 pipx install conan

From cf606e6cbc3e3b08f31e1c01f95933a3eba61296 Mon Sep 17 00:00:00 2001
From: Jake Arkinstall <65358059+jake-arkinstall@users.noreply.github.com>
Date: Fri, 21 Nov 2025 15:02:03 +0000
Subject: [PATCH 11/19] Try maturin-action instead

---
 .github/workflows/python-wheels.yml | 66 ++++-------------------------
 1 file changed, 8 insertions(+), 58 deletions(-)

diff --git a/.github/workflows/python-wheels.yml b/.github/workflows/python-wheels.yml
index ecb4a813e..12e03c8eb 100644
--- a/.github/workflows/python-wheels.yml
+++ b/.github/workflows/python-wheels.yml
@@ -153,54 +153,7 @@ jobs:
           target: ${{ matrix.platform.target }}
           compatibility: ${{ matrix.platform.compatibility }}
 
-      - uses: mlugg/setup-zig@v2
-        if: contains(matrix.platform.target, 'linux')
-
-      - name: Set compatibility flag
-        id: compatibility-flag
-        shell: bash
-        run: |
-          if [ "${{ matrix.platform.target }}" == *"linux"* ]; then
-            WITH_ZIG_FLAG="--with ziglang --with maturin[zig]"
-            COMPATIBILITY_FLAG="--compatibility ${{ matrix.platform.compatibility }} --zig"
-          else
-            WITH_ZIG_FLAG=""
-            COMPATIBILITY_FLAG=""
-          fi
-          echo "COMPATIBILITY_FLAG: $COMPATIBILITY_FLAG"
-          echo "WITH_ZIG_FLAG: $WITH_ZIG_FLAG"
-          echo "COMPATIBILITY_FLAG=$COMPATIBILITY_FLAG" >> "$GITHUB_OUTPUT"
-          echo "WITH_ZIG_FLAG=$WITH_ZIG_FLAG" >> "$GITHUB_OUTPUT"
-
-      - name: Check tket-c-api shared library
-        shell: bash
-        run: |
-          echo "tket-c-api files:"
-          find $TKET_C_API_PATH -type f
-          find $TKET_C_API_PATH -type f -name "*.so" | while IFS= read -r sofile; do
-            echo "======= objdump -f $sofile ======="
-            objdump -f "$sofile" || echo "objdump failed for $sofile"
-            echo "======= readelf -h $sofile ======="
-            readelf -h "$sofile" 2>/dev/null | head -20 || echo "readelf failed for $sofile"
-            echo "======= file $sofile ======="
-            file "$sofile" || echo "file failed for $sofile"
-            echo
-          done
-          find $TKET_C_API_PATH -type f -name "*.dylib" | while IFS= read -r dylibfile; do
-            echo "======= otool -L $dylibfile ======="
-            otool -L "$dylibfile" || echo "otool failed for $dylibfile"
-            echo "======= file $dylibfile ======="
-            file "$dylibfile" || echo "file failed for $dylibfile"
-            echo
-          done
-          find $TKET_C_API_PATH -type f -name "*.lib" | while IFS= read -r libfile; do
-            echo "======= Checking Windows library: $libfile ======="
-            echo "======= file $libfile ======="
-            file "$libfile" || echo "file failed for $libfile"
-            echo
-          done
-
-      - name: Copy DLL to package directory (Windows)
+      - name: Copy tket-c-api DLL to package directory (Windows)
         if: runner.os == 'Windows'
         shell: bash
         run: |
@@ -215,16 +168,13 @@ jobs:
           fi
 
       - name: Build wheels
-        shell: bash
-        run: |
-          cd ${{ env.MODULE_DIR }}
-          uv run --python ${{ env.PYTHON_VERSION }} \
-            ${{ steps.compatibility-flag.outputs.WITH_ZIG_FLAG }} \
-            maturin build ${{ steps.compatibility-flag.outputs.COMPATIBILITY_FLAG }} \
-            --release \
-            --out ../dist \
-            --target ${{ matrix.platform.target }} \
-            --strip
+        uses: PyO3/maturin-action@v1
+        with:
+          working-directory: ${{ env.MODULE_DIR }}
+          target: ${{ matrix.platform.target }}
+          manylinux: ${{ matrix.platform.compatibility }}
+          args: --release --out ../dist --strip -i ${{ env.PYTHON_VERSION }}
+          sccache: true
 
       - name: Build free-threaded wheels
         # TODO: pytket is a required dependency of tket-py, but it doesn't build free-threaded wheels yet

From 28774fee282d77f64e74535e86fee4541c737272 Mon Sep 17 00:00:00 2001
From: Jake Arkinstall <65358059+jake-arkinstall@users.noreply.github.com>
Date: Fri, 21 Nov 2025 15:42:06 +0000
Subject: [PATCH 12/19] Linux maturin-action bootstrap

---
 .github/workflows/python-wheels.yml | 48 ++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/python-wheels.yml b/.github/workflows/python-wheels.yml
index 12e03c8eb..60010e5e1 100644
--- a/.github/workflows/python-wheels.yml
+++ b/.github/workflows/python-wheels.yml
@@ -109,6 +109,7 @@ jobs:
           enable-cache: true
 
       - name: Install LLVM and Clang
+        if: ${{ !contains(matrix.platform.target, 'linux') }}
         uses: KyleMayes/install-llvm-action@v2
         with:
           version: ${{ env.LLVM_VERSION }}
@@ -175,22 +176,39 @@ jobs:
           manylinux: ${{ matrix.platform.compatibility }}
           args: --release --out ../dist --strip -i ${{ env.PYTHON_VERSION }}
           sccache: true
+          before-script-linux: |
+            mkdir -p /tmp/llvm;
+            if [ "$(uname -m)" = "x86_64" ];
+            then
+                curl -LO https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/clang+llvm-14.0.6-x86_64-linux-gnu-rhel-8.4.tar.xz;
+                tar xf clang+llvm-14.0.6-x86_64-linux-gnu-rhel-8.4.tar.xz -C /tmp/llvm --strip-components=1;
+            else
+                dnf install ncurses-compat-libs ncurses-devel -y;
+                curl -LO https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/clang+llvm-14.0.6-aarch64-linux-gnu.tar.xz
+                tar xf clang+llvm-14.0.6-aarch64-linux-gnu.tar.xz -C /tmp/llvm --strip-components=1;
+            fi;
+            export LLVM_SYS_140_PREFIX=/tmp/llvm
+            export WSPACE=${{ env.GITHUB_WORKSPACE }};
+            export TKET_C_API_PATH=${WSPACE}/tket-c-api;
+            export LD_LIBRARY_PATH=${WSPACE}/tket-c-api/lib:/tmp/llvm/${LD_LIBRARY_PATH};
+            export PATH=${WSPACE}/tket-c-api/lib:${PATH}
 
-      - name: Build free-threaded wheels
-        # TODO: pytket is a required dependency of tket-py, but it doesn't build free-threaded wheels yet
-        if: false
-        shell: bash
-        run: |
-          cd ${{ env.MODULE_DIR }}
-          uv run --python ${{ env.PYTHON_VERSION }}+freethreaded \
-            ${{ steps.compatibility-flag.outputs.WITH_ZIG_FLAG }} \
-            maturin build \
-            ${{ steps.compatibility-flag.outputs.COMPATIBILITY_FLAG }} \
-            --auditwheel=repair
-            --release \
-            --out ../dist \
-            --target ${{ matrix.platform.target }} \
-            --strip
+
+      #- name: Build free-threaded wheels
+      #  # TODO: pytket is a required dependency of tket-py, but it doesn't build free-threaded wheels yet
+      #  if: false
+      #  shell: bash
+      #  run: |
+      #    cd ${{ env.MODULE_DIR }}
+      #    uv run --python ${{ env.PYTHON_VERSION }}+freethreaded \
+      #      ${{ steps.compatibility-flag.outputs.WITH_ZIG_FLAG }} \
+      #      maturin build \
+      #      ${{ steps.compatibility-flag.outputs.COMPATIBILITY_FLAG }} \
+      #      --auditwheel=repair
+      #      --release \
+      #      --out ../dist \
+      #      --target ${{ matrix.platform.target }} \
+      #      --strip
 
       - name: Repair macOS wheels with delocate
         if: runner.os == 'macOS'

From f902722e1dc14973e764c176d542b035a0a92a7b Mon Sep 17 00:00:00 2001
From: Jake Arkinstall <65358059+jake-arkinstall@users.noreply.github.com>
Date: Fri, 21 Nov 2025 15:51:22 +0000
Subject: [PATCH 13/19] More useful caching of tket-c-api

---
 .github/actions/tket-c-api/action.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/actions/tket-c-api/action.yml b/.github/actions/tket-c-api/action.yml
index 5f75d08df..c37646463 100644
--- a/.github/actions/tket-c-api/action.yml
+++ b/.github/actions/tket-c-api/action.yml
@@ -17,11 +17,11 @@ runs:
   using: composite
   steps:
     - name: Attempt to retrieve cached tket-c-api
-      uses: actions/cache@v4
+      uses: actions/cache/restore@v4
       id: cache
       with:
         path: ${{ inputs.install-path }}
-        key: ${{ runner.os }}-${{ inputs.target }}-${{ hashFiles('tket1-passes/conanfile.txt') }}-${{ hashFiles('tket1-passes/scripts/build.sh') }}-${{ hashFiles('tket1-passes/scripts/build/${{ inputs.target }}.sh') }}-${{ hashFiles('.github/actions/tket-c-api/action.yml') }}
+        key: ${{ runner.os }}-${{ inputs.target }}-${{ hashFiles('tket1-passes/conanfile.txt') }}
 
     - name: Run install script
       if: steps.cache.outputs.cache-hit != 'true'
@@ -32,6 +32,13 @@ runs:
           "${{ inputs.compatibility }}" \
           "${{ inputs.install-path }}"
 
+    - name: Save the cached tket-c-api
+      if: steps.cache.outputs.cache-hit != 'true'
+      uses: actions/cache/save@v4
+      with:
+        path: ${{ inputs.install-path }}
+        key: ${{ steps.cache.outputs.cache-primary-key }}
+
     - name: List tket-c-api library files
       shell: bash
       run: |

From 979f5f355a0abd6d7a73c894f6c3a9207b424af6 Mon Sep 17 00:00:00 2001
From: Jake Arkinstall <65358059+jake-arkinstall@users.noreply.github.com>
Date: Fri, 21 Nov 2025 17:49:22 +0000
Subject: [PATCH 14/19] Pass env vars to maturin-action container

---
 .github/workflows/python-wheels.yml | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/python-wheels.yml b/.github/workflows/python-wheels.yml
index 60010e5e1..9f9d98983 100644
--- a/.github/workflows/python-wheels.yml
+++ b/.github/workflows/python-wheels.yml
@@ -106,10 +106,10 @@ jobs:
         uses: astral-sh/setup-uv@v7
         with:
           version: ${{ env.UV_VERSION }}
+          python-version: ${{ env.PYTHON_VERSION }}
           enable-cache: true
 
       - name: Install LLVM and Clang
-        if: ${{ !contains(matrix.platform.target, 'linux') }}
         uses: KyleMayes/install-llvm-action@v2
         with:
           version: ${{ env.LLVM_VERSION }}
@@ -174,24 +174,8 @@ jobs:
           working-directory: ${{ env.MODULE_DIR }}
           target: ${{ matrix.platform.target }}
           manylinux: ${{ matrix.platform.compatibility }}
-          args: --release --out ../dist --strip -i ${{ env.PYTHON_VERSION }}
+          args: --release --out ../dist --strip -i ${{ env.PYTHON_VERSION }} -e TKET_C_API_PATH -e LLVM_PATH
           sccache: true
-          before-script-linux: |
-            mkdir -p /tmp/llvm;
-            if [ "$(uname -m)" = "x86_64" ];
-            then
-                curl -LO https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/clang+llvm-14.0.6-x86_64-linux-gnu-rhel-8.4.tar.xz;
-                tar xf clang+llvm-14.0.6-x86_64-linux-gnu-rhel-8.4.tar.xz -C /tmp/llvm --strip-components=1;
-            else
-                dnf install ncurses-compat-libs ncurses-devel -y;
-                curl -LO https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/clang+llvm-14.0.6-aarch64-linux-gnu.tar.xz
-                tar xf clang+llvm-14.0.6-aarch64-linux-gnu.tar.xz -C /tmp/llvm --strip-components=1;
-            fi;
-            export LLVM_SYS_140_PREFIX=/tmp/llvm
-            export WSPACE=${{ env.GITHUB_WORKSPACE }};
-            export TKET_C_API_PATH=${WSPACE}/tket-c-api;
-            export LD_LIBRARY_PATH=${WSPACE}/tket-c-api/lib:/tmp/llvm/${LD_LIBRARY_PATH};
-            export PATH=${WSPACE}/tket-c-api/lib:${PATH}
 
 
       #- name: Build free-threaded wheels

From 26afad72b1b863c886bbc68d17d1444f3c2b5d93 Mon Sep 17 00:00:00 2001
From: Jake Arkinstall <65358059+jake-arkinstall@users.noreply.github.com>
Date: Fri, 21 Nov 2025 17:55:13 +0000
Subject: [PATCH 15/19] Update python-wheels.yml

---
 .github/workflows/python-wheels.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/python-wheels.yml b/.github/workflows/python-wheels.yml
index 9f9d98983..b6d2374f0 100644
--- a/.github/workflows/python-wheels.yml
+++ b/.github/workflows/python-wheels.yml
@@ -174,7 +174,8 @@ jobs:
           working-directory: ${{ env.MODULE_DIR }}
           target: ${{ matrix.platform.target }}
           manylinux: ${{ matrix.platform.compatibility }}
-          args: --release --out ../dist --strip -i ${{ env.PYTHON_VERSION }} -e TKET_C_API_PATH -e LLVM_PATH
+          args: --release --out ../dist --strip -i ${{ env.PYTHON_VERSION }}
+          docker-options: -e TKET_C_API_PATH -e LLVM_PATH
           sccache: true
 
 

From 7405e175d6219520b74aaf6e426f13e794856440 Mon Sep 17 00:00:00 2001
From: Jake Arkinstall <65358059+jake-arkinstall@users.noreply.github.com>
Date: Fri, 21 Nov 2025 22:47:59 +0000
Subject: [PATCH 16/19] Update python-wheels.yml

---
 .github/workflows/python-wheels.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-wheels.yml b/.github/workflows/python-wheels.yml
index b6d2374f0..43e47a320 100644
--- a/.github/workflows/python-wheels.yml
+++ b/.github/workflows/python-wheels.yml
@@ -175,7 +175,7 @@ jobs:
           target: ${{ matrix.platform.target }}
           manylinux: ${{ matrix.platform.compatibility }}
           args: --release --out ../dist --strip -i ${{ env.PYTHON_VERSION }}
-          docker-options: -e TKET_C_API_PATH -e LLVM_PATH
+          docker-options: -e TKET_C_API_PATH -e LLVM_PATH -e LD_LIBRARY_PATH
           sccache: true
 
 

From 15f76e110c5836a7589f3ad3010c961a0b52b255 Mon Sep 17 00:00:00 2001
From: Jake Arkinstall <65358059+jake-arkinstall@users.noreply.github.com>
Date: Fri, 21 Nov 2025 23:02:26 +0000
Subject: [PATCH 17/19] Update python-wheels.yml

---
 .github/workflows/python-wheels.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/python-wheels.yml b/.github/workflows/python-wheels.yml
index 43e47a320..acc964de3 100644
--- a/.github/workflows/python-wheels.yml
+++ b/.github/workflows/python-wheels.yml
@@ -113,6 +113,7 @@ jobs:
         uses: KyleMayes/install-llvm-action@v2
         with:
           version: ${{ env.LLVM_VERSION }}
+          env: true
 
         # Set the path to the cached tket-c-api library
         # When this envvar is set, the `./.github/actions/tket-c-api` action **must** be run to fetch the artifacts

From a433ee2611fccea350a289061d30efb3ff32ac7a Mon Sep 17 00:00:00 2001
From: Jake Arkinstall <65358059+jake-arkinstall@users.noreply.github.com>
Date: Sat, 22 Nov 2025 22:09:01 +0000
Subject: [PATCH 18/19] Ok, install-llvm-action's env=true made things worse.
 Undoing that.

---
 .github/workflows/python-wheels.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/python-wheels.yml b/.github/workflows/python-wheels.yml
index acc964de3..9deedc549 100644
--- a/.github/workflows/python-wheels.yml
+++ b/.github/workflows/python-wheels.yml
@@ -113,7 +113,6 @@ jobs:
         uses: KyleMayes/install-llvm-action@v2
         with:
           version: ${{ env.LLVM_VERSION }}
-          env: true
 
         # Set the path to the cached tket-c-api library
         # When this envvar is set, the `./.github/actions/tket-c-api` action **must** be run to fetch the artifacts
@@ -176,7 +175,7 @@ jobs:
           target: ${{ matrix.platform.target }}
           manylinux: ${{ matrix.platform.compatibility }}
           args: --release --out ../dist --strip -i ${{ env.PYTHON_VERSION }}
-          docker-options: -e TKET_C_API_PATH -e LLVM_PATH -e LD_LIBRARY_PATH
+          docker-options: -e TKET_C_API_PATH -e LLVM_PATH -e LD_LIBRARY_PATH -e PATH
           sccache: true
 
 

From b86644872352007561b573def1cc9d71f8156ac5 Mon Sep 17 00:00:00 2001
From: Jake Arkinstall <65358059+jake-arkinstall@users.noreply.github.com>
Date: Sat, 22 Nov 2025 22:19:40 +0000
Subject: [PATCH 19/19] Try setting LD_LIBRARY_PATH explicitly

---
 .github/workflows/python-wheels.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/python-wheels.yml b/.github/workflows/python-wheels.yml
index 9deedc549..fd1531ee9 100644
--- a/.github/workflows/python-wheels.yml
+++ b/.github/workflows/python-wheels.yml
@@ -175,7 +175,9 @@ jobs:
           target: ${{ matrix.platform.target }}
           manylinux: ${{ matrix.platform.compatibility }}
           args: --release --out ../dist --strip -i ${{ env.PYTHON_VERSION }}
-          docker-options: -e TKET_C_API_PATH -e LLVM_PATH -e LD_LIBRARY_PATH -e PATH
+          docker-options: -e TKET_C_API_PATH
+          before-script-linux:
+            export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$TKET_C_API_PATH/lib:/home/runner/work/tket2/tket2/llvm/lib";
           sccache: true