From 2a06ef8c26a6830e31e4be8bd9a9679650114ef5 Mon Sep 17 00:00:00 2001 From: John Dumbell Date: Thu, 14 Mar 2024 14:40:20 +0000 Subject: [PATCH] test mac --- .github/actions/install-llvm/action.yml | 6 +++--- .github/workflows/deploy-wheels.yml | 19 ++++++++++--------- src/rasqal/pyproject.toml | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/actions/install-llvm/action.yml b/.github/actions/install-llvm/action.yml index 424a8be..04ac033 100644 --- a/.github/actions/install-llvm/action.yml +++ b/.github/actions/install-llvm/action.yml @@ -36,10 +36,10 @@ runs: choco uninstall -y llvm shell: pwsh if: ${{ (inputs.os == 'windows-2019') && (steps.cache-llvm.outputs.cache-hit != 'true') }} - - name: MacOS - Install build dependencies, ninja - run: brew install ninja + - name: MacOS - Install build dependencies, ccache, ninja + run: brew install ccache ninja shell: pwsh - if: ${{ (inputs.os == 'macos-11') && (steps.cache-llvm.outputs.cache-hit != 'true') }} + if: ${{ matrix.config.os == 'macos-14' }} - name: Configure long paths run: git config --global core.longpaths true diff --git a/.github/workflows/deploy-wheels.yml b/.github/workflows/deploy-wheels.yml index 48b6972..e88890f 100644 --- a/.github/workflows/deploy-wheels.yml +++ b/.github/workflows/deploy-wheels.yml @@ -18,18 +18,18 @@ jobs: # target: "default", # env: { }, # } - - { - os: "windows-2019", - arch: "amd64", - target: "default", - env: { }, - } # - { -# os: "macos-14", -# arch: "aarch64", +# os: "windows-2019", +# arch: "amd64", # target: "default", # env: { }, # } + - { + os: "macos-14", + arch: "arm64", + target: "default", + env: { }, + } steps: - uses: actions/checkout@v4 - name: Setup rust toolchain @@ -38,9 +38,10 @@ jobs: toolchain: 1.75.0 components: rustfmt clippy - name: Set up Python 3.9 - uses: actions/setup-python@v5 + uses: actions/setup-python@v3 with: python-version: 3.9 + if: ${{ matrix.config.os != 'macos-14' }} - name: Install LLVM uses: ./.github/actions/install-llvm with: diff --git a/src/rasqal/pyproject.toml b/src/rasqal/pyproject.toml index bcfd6a4..e671d70 100644 --- a/src/rasqal/pyproject.toml +++ b/src/rasqal/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "rasqal" -version = "0.1.3" +version = "0.1.4" requires-python = ">=3.9" description = "A dynamically executed quantum-classical hybrid optimizing runtime." license = { file = "LICENSE" }