Skip to content

Commit

Permalink
Avoiding Linux ARM emulation in CI for now
Browse files Browse the repository at this point in the history
  • Loading branch information
Twixes committed Oct 5, 2023
1 parent 50a11d7 commit 6ecd517
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/build-hogql-parser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
build-wheels:
name: Build wheels on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
timeout-minutes: 30
timeout-minutes: 60
strategy:
fail-fast: false
matrix:
Expand All @@ -39,7 +39,7 @@ jobs:
- name: Build wheels
run: cd hogql_parser && python -m cibuildwheel --output-dir wheelhouse
env:
MACOSX_DEPLOYMENT_TARGET: '12'
MACOSX_DEPLOYMENT_TARGET: '12' # A modern target allows us to use C++20

- uses: actions/upload-artifact@v3
with:
Expand All @@ -57,4 +57,5 @@ jobs:
name: artifact
path: dist

- uses: pypa/gh-action-pypi-publish@release/v1
- name: Publish package to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
7 changes: 3 additions & 4 deletions hogql_parser/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,16 @@ build = [ # Build CPython wheels on Linux and macOS, for x86 as well as ARM
"cp3*-macosx_x86_64",
"cp3*-macosx_arm64",
"cp3*-manylinux_x86_64",
"cp3*-manylinux_aarch64",
]
build-frontend = "build"
build-frontend = "build" # This is successor to building with pip

[tool.cibuildwheel.macos]
archs = ["x86_64", "arm64"] # We could also build a universal wheel, but separate ones are lighter individually
before-all = ["brew install boost antlr antlr4-cpp-runtime"]

[tool.cibuildwheel.linux]
before-all = [
# manylinux_2_28 uses AlmaLinux 8, which uses Fedora's dnf as its package manager
# manylinux_2_28 is based on AlmaLinux 8, which uses Fedora's dnf as its package manager
"dnf install -y boost-devel unzip cmake curl uuid pkg-config",
"curl https://www.antlr.org/download/antlr4-cpp-runtime-4.13.1-source.zip --output antlr4-source.zip",
"unzip antlr4-source.zip -d antlr4-source && cd antlr4-source",
Expand All @@ -23,6 +22,6 @@ before-all = [
"cp out/usr/local/lib64/libantlr4-runtime.so* /usr/local/lib",
"ldconfig",
]
archs = ["auto", "aarch64"]
archs = ["x86_64", "aarch64"]
manylinux-x86_64-image = "manylinux_2_28"
manylinux-aarch64-image = "manylinux_2_28"

0 comments on commit 6ecd517

Please sign in to comment.