diff --git a/.github/workflows/assets.yml b/.github/workflows/assets.yml index 7dbb00ebe..d0433339c 100644 --- a/.github/workflows/assets.yml +++ b/.github/workflows/assets.yml @@ -14,7 +14,7 @@ on: # 'jobs..strategy.fail-fast: false' until a proper solution is implemented jobs: macos-x64: - name: PyPI wheels for macOS + name: PyPI wheels for macOS (x64) runs-on: macos-latest strategy: fail-fast: false @@ -59,6 +59,53 @@ jobs: asset_name: ${{ env.WHEEL_NAME }} asset_content_type: application/zip + macos-arm64: + name: PyPI wheels for macOS (arm64) + runs-on: [self-hosted, ARM64, macOS] + strategy: + fail-fast: false + matrix: + python: + - "3.8" + - "3.9" + - "3.10" + - "3.11" + - "3.12" + steps: + - name: Checkout + uses: actions/checkout@v3 + - uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python }} + - name: Install dependencies + run: | + brew install bison flex swig xquartz + echo "/usr/local/opt/bison/bin" >> $GITHUB_PATH + echo "/usr/local/opt/flex/bin" >> $GITHUB_PATH + echo "$(brew --prefix java)/bin" >> $GITHUB_PATH + python -m pip install --upgrade pip conan setuptools wheel + - name: Build wheel + run: python setup.py bdist_wheel + - name: Wheel path + id: wheel + working-directory: pybuild/dist/ + run: | + echo "WHEEL_NAME=$(ls *.whl)" >> $GITHUB_OUTPUT + echo "WHEEL_NAME=$(ls *.whl)" >> $GITHUB_ENV + - uses: actions/upload-artifact@v3 + with: + name: pypi-macos-py${{ matrix.python }} + path: pybuild/dist/${{ env.WHEEL_NAME }} + - uses: actions/upload-release-asset@v1 + if: ${{ github.event_name == 'release' && github.event.action == 'created' }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ github.event.release.upload_url }} + asset_path: pybuild/dist/${{ env.WHEEL_NAME }} + asset_name: ${{ env.WHEEL_NAME }} + asset_content_type: application/zip + manylinux-x64: name: PyPI wheels for Manylinux (x64) runs-on: ubuntu-latest @@ -115,10 +162,7 @@ jobs: manylinux-arm64: name: PyPI wheels for Manylinux (arm64) - runs-on: - - "self-hosted" - - "ARM64" - - "Linux" + runs-on: [self-hosted, ARM64, Linux] container: quay.io/pypa/manylinux${{ matrix.manylinux }}_aarch64:latest env: BISON_VERSION: ${{ matrix.bison_version }} @@ -226,6 +270,7 @@ jobs: if: ${{ github.event_name == 'release' && github.event.action == 'created' }} needs: - macos-x64 + - macos-arm64 - manylinux-x64 - manylinux-arm64 - windows-x64 diff --git a/CHANGELOG.md b/CHANGELOG.md index 57b0592b0..03bdc4d62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,12 +3,21 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [ 0.12.2 ] - [ 2024-01-09 ] +## [ 0.12.3 ] - [ 2024-01-17 ] ### Added +- `macos-arm64` job in `.github/workflow/assets.yml`. ### Changed +### Removed + + +## [ 0.12.2 ] - [ 2024-01-09 ] + +### Added + +### Changed - Fixed `upload-release-asset` steps in `.github/workflow/assets.yml` for `windows-x64` job. ### Removed @@ -19,7 +28,6 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Added ### Changed - - Fixed `upload-release-asset` steps in `.github/workflow/assets.yml`. - Updated `RELEASE.md`. diff --git a/include/ql/version.h b/include/ql/version.h index 310e05539..64d3f8a31 100644 --- a/include/ql/version.h +++ b/include/ql/version.h @@ -8,4 +8,4 @@ * OPENQL_VERSION_STRING is also decoded by version.py */ -#define OPENQL_VERSION_STRING "0.12.2" +#define OPENQL_VERSION_STRING "0.12.3"