Skip to content

Commit

Permalink
feat: update actions and Pybind11
Browse files Browse the repository at this point in the history
  • Loading branch information
nodtem66 committed Apr 28, 2023
1 parent 135d662 commit a61af75
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 21 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/binary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: true

Expand All @@ -51,7 +51,7 @@ jobs:
run: cmake --build . --config $BUILD_TYPE

- name: Upload binary
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: ${{ matrix.os }}
retention-days: 1
Expand All @@ -72,25 +72,25 @@ jobs:
runs-on: ubuntu-latest
needs: [build]
steps:
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: ubuntu-latest
path: ubuntu

- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: macos-latest
path: macos

- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: windows-latest
path: windows

- name: List files
run: ls -R

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
name: bin64
path: ${{github.workspace}}/**
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/binary_debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Input
run: echo "${{ github.event.inputs.os }} ${{ github.event.inputs.compiler }}"

- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: true

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mkdoc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: 3.x
- run: pip install mkdocs-material
Expand Down
21 changes: 11 additions & 10 deletions .github/workflows/wheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ on:
env:
CIBW_TEST_COMMAND: python {project}/src/python/test.py
CIBW_TEST_REQUIRES: numpy
CIBW_TEST_SKIP: cp310-macosx_x86_64
CIBW_TEST_SKIP: cp310-macosx_x86_64 cp311-macosx_x86_64

jobs:
build_sdist:
name: Build SDist
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: true

- uses: actions/setup-python@v2
- uses: actions/setup-python@v4

- name: Install deps
run: python -m pip install twine build
Expand All @@ -33,7 +33,7 @@ jobs:
- name: Check metadata
run: twine check dist/*

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
path: dist/*.tar.gz

Expand All @@ -47,7 +47,7 @@ jobs:
os: [ubuntu-latest, windows-latest, macos-latest]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: true

Expand All @@ -69,7 +69,7 @@ jobs:
shell: bash

- name: Upload wheels
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
path: wheelhouse/*.whl

Expand All @@ -80,14 +80,15 @@ jobs:
if: github.event.inputs.upload != false

steps:
- uses: actions/setup-python@v2
- uses: actions/setup-python@v4

- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: artifact
path: dist

- uses: pypa/gh-action-pypi-publish@v1.4.2
- uses: pypa/gh-action-pypi-publish@v1.8.5
with:
user: __token__
password: ${{ secrets.PYPI_API_TOKEN }}
password: ${{ secrets.PYPI_API_TOKEN }}
skip-existing: true
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ if(NOT EXISTS "${PROJECT_SOURCE_DIR}/external/libigl/CMakeLists.txt" OR
download_external_files(
https://github.com/nodtem66/Scaffolder/releases/download/v1.5.2/external.tar.gz
"${PROJECT_SOURCE_DIR}/scripts/external.tar.gz"
b7e679f68df88d81b8cff09f0c75e81b4537d655e8e57fa7426050e734ee2102
7c85850c2983cced32efab8a290795dd5dd67710c48501e5f54d76b8d43be519
)
file(ARCHIVE_EXTRACT INPUT "${PROJECT_SOURCE_DIR}/scripts/external.tar.gz" DESTINATION ${PROJECT_SOURCE_DIR})
endif()
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = PyScaffolder
version = 1.5.2
version = 1.5.2-1
author = Jirawat Iamsamang
author_email = [email protected]
description = Generate 3D mesh from implicit surface and an input mesh
Expand Down

0 comments on commit a61af75

Please sign in to comment.