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

Fix publishing #1056

Merged
merged 9 commits into from
Nov 18, 2024
Merged

Fix publishing #1056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b5f997e
try to fix npm artifacts
elalish Nov 18, 2024
08fc353
fix python SDist
pca006132 Nov 18, 2024
6f1d2be
cibuildwheel: build universal binary for macos
pca006132 Nov 18, 2024
b1d0b1d
try to build all binaries
pca006132 Nov 18, 2024
35987c8
skip builds on incompatible architecture
pca006132 Nov 18, 2024
4a103c8
again
pca006132 Nov 18, 2024
47671a6
typo...
pca006132 Nov 18, 2024
51badd0
typo?
pca006132 Nov 18, 2024
eec2b50
update
pca006132 Nov 18, 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
8 changes: 7 additions & 1 deletion .github/workflows/build_wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,17 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-22.04, windows-2019, macos-latest]
# macos-13: x86-64
# macos-14: arm64
os: [ubuntu-22.04, windows-2019, macos-14, macos-13]
steps:
- run: |
git config --global submodule.fetchJobs 8
git config --global core.longpaths true
- if: matrix.os == 'macos-13'
run: echo "CIBW_ARCHS=x86_64" >> "$GITHUB_ENV"
- if: matrix.os == 'macos-14'
run: echo "CIBW_ARCHS=arm64 universal2" >> "$GITHUB_ENV"
- uses: actions/checkout@v4
- name: Build wheels
uses: pypa/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
mv ./docs ./public

- name: Download built examples
uses: dawidd6/action-download-artifact@v3
uses: dawidd6/action-download-artifact@v6
with:
workflow: manifold.yml
workflow_conclusion: completed
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish_npm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '20.x'
node-version: 20
registry-url: 'https://registry.npmjs.org'

- name: Download built examples
uses: dawidd6/action-download-artifact@v3
uses: dawidd6/action-download-artifact@v6
with:
workflow: manifold.yml
workflow_conclusion: completed
Expand Down
8 changes: 5 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,11 @@ include(${PROJECT_SOURCE_DIR}/cmake/configHelper.cmake)

add_subdirectory(src)
add_subdirectory(bindings)
add_subdirectory(samples)
add_subdirectory(test)
add_subdirectory(extras)
if(MANIFOLD_TEST)
add_subdirectory(samples)
add_subdirectory(test)
add_subdirectory(extras)
endif()

include(${PROJECT_SOURCE_DIR}/cmake/info.cmake)

Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,8 @@ before-all = "git clone --depth 1 --branch v2021.10.0 https://github.com/oneapi-
"cmake.define.FETCHCONTENT_UPDATES_DISCONNECTED" = "ON"

[tool.cibuildwheel.macos]
archs = ["x86_64", "arm64"]
archs = ["x86_64", "arm64", "universal2"]
environment = "MACOSX_DEPLOYMENT_TARGET=10.14"
test-skip = "*-macosx_arm64 *-macosx_universal2:arm64"

[tool.cibuildwheel.windows]
before-build = "pip install delvewheel"
Expand Down
Loading