Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use new runner with macOS Sonoma #780

Open
wants to merge 8 commits into
base: dev
Choose a base branch
from
Open

Use new runner with macOS Sonoma #780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7e31c59
Use new runner with macOS Sonoma
wenkokke Feb 10, 2024
0192226
Add arch label to all runners
wenkokke Feb 10, 2024
e2c9d9c
Merge branch 'dev' into macos-14
wenkokke Feb 10, 2024
dfeb4bb
Don't test py38 wheels on macosx with arm64
wenkokke Feb 10, 2024
7206010
Add macosx-arm64
wenkokke Feb 10, 2024
f8bad41
Fix test-skip
wenkokke Feb 10, 2024
04d428e
Use internal setup-haskell action
wenkokke Feb 17, 2024
7a379c4
Merge branch 'dev' into macos-14
wenkokke May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions .github/workflows/build-vehicle-python.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,15 @@ jobs:
plat: "musllinux"
test: "test"
- name: "macOS"
type: "macos-latest"
type: "macos-12"
arch: "x86_64"
plat: "macosx"
test: "test,tensorflow"
- name: "macOS"
type: "macos-14"
arch: "arm64"
plat: "macosx"
test: "test"
- name: "Windows"
type: "windows-latest"
arch: "AMD64"
Expand All @@ -49,12 +54,14 @@ jobs:
- name: Get source
uses: actions/checkout@v4

- name: Setup GHC ${{ env.DEFAULT_GHC_VERSION }}
- name: Setup Haskell
if: matrix.os.name == 'macOS' || matrix.os.name == 'Windows'
uses: haskell/actions/setup@v2
uses: ./.github/actions/setup-haskell
with:
ghc-version: ${{ env.DEFAULT_GHC_VERSION }}
cabal-version: ${{ env.DEFAULT_CABAL_VERSION }}
cabal-project-file: "vehicle-python/cabal.project"
cabal-project-freeze-file: "vehicle-python/cabal.project.freeze"

- name: Build wheel
uses: pypa/[email protected]
Expand Down
18 changes: 16 additions & 2 deletions .github/workflows/build-vehicle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,16 @@ jobs:
os:
- name: "Linux"
type: ubuntu-latest
arch: "x86_64"
- name: "macOS"
type: "macos-latest"
type: "macos-12"
arch: "x86_64"
- name: "macOS"
type: "macos-14"
arch: "arm64"
- name: "Windows"
type: "windows-latest"
arch: "amd64"
haskell:
- ghc:
version: "9.4.8"
Expand All @@ -31,6 +37,7 @@ jobs:
- os:
name: Linux
type: ubuntu-latest
arch: "x86_64"
haskell:
ghc:
version: "9.8.1"
Expand All @@ -44,6 +51,7 @@ jobs:
- os:
name: Linux
type: ubuntu-latest
arch: "x86_64"
haskell:
ghc:
version: "9.6.4"
Expand All @@ -56,6 +64,7 @@ jobs:
- os:
name: Linux
type: ubuntu-latest
arch: "x86_64"
haskell:
ghc:
version: "9.2.8"
Expand All @@ -68,6 +77,7 @@ jobs:
- os:
name: Linux
type: ubuntu-latest
arch: "x86_64"
haskell:
ghc:
version: "9.0.2"
Expand All @@ -80,6 +90,7 @@ jobs:
- os:
name: Linux
type: ubuntu-latest
arch: "x86_64"
haskell:
ghc:
version: "8.10.7"
Expand All @@ -92,6 +103,7 @@ jobs:
- os:
name: Linux
type: ubuntu-latest
arch: "x86_64"
haskell:
ghc:
version: "9.4.8"
Expand All @@ -106,6 +118,7 @@ jobs:
# - os:
# name: Linux
# type: ubuntu-latest
# arch: "x86_64"
# haskell:
# ghc:
# version: "9.4.8"
Expand All @@ -119,6 +132,7 @@ jobs:
# - os:
# name: Linux
# type: ubuntu-latest
# arch: "x86_64"
# haskell:
# ghc:
# version: "9.4.8"
Expand All @@ -127,7 +141,7 @@ jobs:
# project-file: "cabal.project.ghc-debug.nothunks.ghc-9.4.8"
# extra-args: "-fghc-debug -fnothunks"

name: vehicle / ${{ matrix.os.name }} - GHC ${{ matrix.haskell.ghc.version }} ${{ matrix.haskell.cabal.extra-args }}
name: vehicle / ${{ matrix.os.name }} - ${{ matrix.os.arch }} - GHC ${{ matrix.haskell.ghc.version }} ${{ matrix.haskell.cabal.extra-args }}
runs-on: ${{ matrix.os.type }}

steps:
Expand Down
11 changes: 9 additions & 2 deletions vehicle-python/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ build-frontend = "build"
build = [
# Using a GitHub runner
"*-macosx_x86_64",
"*-macosx_arm64",
# Using a GitHub runner
"*-win_amd64",
# Using wenkokke/manylinux2014_ghc948_x86_64
Expand All @@ -57,8 +58,14 @@ skip = [
# PyPy builds do not work.
"pp*",
]
#test-command = "pytest {package}/tests"
#test-extras = "test"
# 10-02-2024:
# While cibuildwheel can build CPython 3.8 universal2/arm64 wheels,
# it cannot test the arm64 part of them, even when running on an Apple Silicon machine.
# This is because we use the x86_64 installer of CPython 3.8.
# See the discussion in https://github.com/pypa/cibuildwheel/pull/1169 for the details.
test-skip = "cp38-macosx_*:arm64"
test-command = "pytest {package}/tests"
test-extras = "test"
# 19-06-2023:
# Use custom manylinux and musllinux images with GHC 9.4.8 preinstalled.
manylinux-aarch64-image = "wenkokke/manylinux_2_28_ghc948_aarch64"
Expand Down
Loading