From 15a64c81fbf0d22920832d542f8decf7b28d86f1 Mon Sep 17 00:00:00 2001 From: Richie Yeung Date: Tue, 24 Oct 2023 15:58:24 +0100 Subject: [PATCH 1/3] Fix indent in build --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 31c4277..7a86e4b 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -54,7 +54,7 @@ jobs: python-version: '3.11' - name: build wheel (3.11) run: .github/workflows/macosbuildwheel - - name: set up python 3.12 + - name: set up python 3.12 uses: actions/setup-python@v2 with: python-version: '3.12' From 1fe8ee52413ffd6f87d94c9e4ad33810c8b1631b Mon Sep 17 00:00:00 2001 From: Richie Yeung Date: Tue, 24 Oct 2023 15:58:24 +0100 Subject: [PATCH 2/3] Fix build --- .github/workflows/wheels.yml | 6 +++--- CMakeLists.txt | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 31c4277..067a6ae 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -2,11 +2,11 @@ name: wheels on: push: branches: - - 'wheel/**' + - 'build-wheel' jobs: build_linux_wheels: name: build linux wheels - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest env: PY_VERS: cp38-cp38 cp39-cp39 cp310-cp310 cp311-cp311 cp312-cp312 steps: @@ -54,7 +54,7 @@ jobs: python-version: '3.11' - name: build wheel (3.11) run: .github/workflows/macosbuildwheel - - name: set up python 3.12 + - name: set up python 3.12 uses: actions/setup-python@v2 with: python-version: '3.12' diff --git a/CMakeLists.txt b/CMakeLists.txt index c25558a..75afb41 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,3 @@ add_subdirectory(src) add_subdirectory(cryptomite) -if(BUILD_TESTING) - add_subdirectory(test) -endif() From 75a131290bf52888cd9bab36786625773763ca72 Mon Sep 17 00:00:00 2001 From: Richie Yeung Date: Tue, 14 Nov 2023 19:31:19 +0000 Subject: [PATCH 3/3] Build wheels for Apple Silicon --- .github/workflows/wheels.yml | 66 +++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 27 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 067a6ae..9973cf1 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -64,33 +64,45 @@ jobs: with: name: macos_wheels path: wheelhouse/ -# build_macos_m1_wheels: -# name: build macos m1 wheels -# runs-on: [self-hosted, macos, M1] -# defaults: -# run: -# shell: "/usr/bin/arch -arch arm64e /bin/bash {0}" -# steps: -# - uses: actions/checkout@v2 -# - name: build wheel (3.8) -# run: | -# eval "$(pyenv init -)" -# pyenv shell tket-3.8 -# .github/workflows/macosbuildwheel -# - name: build wheel (3.9) -# run: | -# eval "$(pyenv init -)" -# pyenv shell tket-3.9 -# .github/workflows/macosbuildwheel -# - name: build wheel (3.10) -# run: | -# eval "$(pyenv init -)" -# pyenv shell tket-3.10 -# .github/workflows/macosbuildwheel -# - uses: actions/upload-artifact@v2 -# with: -# name: macos_m1_wheels -# path: wheelhouse/ + build_macos_m1_wheels: + name: build macos M1 wheels + runs-on: macos-latest-xlarge + steps: + - uses: actions/checkout@v2 + - name: set up python 3.8 + uses: actions/setup-python@v2 + with: + python-version: '3.8' + - name: build wheel (3.8) + run: .github/workflows/macosbuildwheel + - name: set up python 3.9 + uses: actions/setup-python@v2 + with: + python-version: '3.9' + - name: build wheel (3.9) + run: .github/workflows/macosbuildwheel + - name: set up python 3.10 + uses: actions/setup-python@v2 + with: + python-version: '3.10' + - name: build wheel (3.10) + run: .github/workflows/macosbuildwheel + - name: set up python 3.11 + uses: actions/setup-python@v2 + with: + python-version: '3.11' + - name: build wheel (3.11) + run: .github/workflows/macosbuildwheel + - name: set up python 3.12 + uses: actions/setup-python@v2 + with: + python-version: '3.12' + - name: build wheel (3.12) + run: .github/workflows/macosbuildwheel + - uses: actions/upload-artifact@v2 + with: + name: macos_m1_wheels + path: wheelhouse/ build_windows_wheels: name: build windows wheels runs-on: windows-2019