Skip to content

Commit a67aa13

Browse files
elalishelalish
authored
v2.4.1 (#758)
update actions
1 parent d437097 commit a67aa13

10 files changed

+33
-33
lines changed

‎.github/workflows/build_wheels.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616
- run: |
1717
git config --global submodule.fetchJobs 8
1818
git config --global core.longpaths true
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020
with:
2121
submodules: recursive
2222
- name: Build wheels
23-
uses: pypa/cibuildwheel@v2.15.0
24-
- uses: actions/upload-artifact@v3
23+
uses: pypa/cibuildwheel@v2
24+
- uses: actions/upload-artifact@v4
2525
with:
2626
path: ./wheelhouse/*.whl
2727

@@ -34,7 +34,7 @@ jobs:
3434
submodules: recursive
3535
- name: Build SDist
3636
run: pipx run build --sdist
37-
- uses: actions/upload-artifact@v3
37+
- uses: actions/upload-artifact@v4
3838
with:
3939
path: dist/*.tar.gz
4040

@@ -49,7 +49,7 @@ jobs:
4949
permissions:
5050
id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
5151
steps:
52-
- uses: actions/download-artifact@v3
52+
- uses: actions/download-artifact@v4
5353
with:
5454
name: artifact
5555
path: dist

‎.github/workflows/check_format.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-20.04
1212

1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
- uses: DoozyX/[email protected]
1616
with:
1717
source: '.'

‎.github/workflows/deploy.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-20.04
1111

1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414

1515
- name: Doxygen Action
1616
uses: mattnotmitt/doxygen-action@v1
@@ -22,7 +22,7 @@ jobs:
2222
mv ./docs ./public
2323
2424
- name: Download built examples
25-
uses: dawidd6/action-download-artifact@v2
25+
uses: dawidd6/action-download-artifact@v3
2626
with:
2727
workflow: manifold.yml
2828
workflow_conclusion: completed

‎.github/workflows/manifold.yml

+15-15
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
sudo apt-get -y update
2525
DEBIAN_FRONTEND=noninteractive sudo apt install -y libglm-dev libgtest-dev libassimp-dev git libtbb-dev libthrust-dev pkg-config libpython3-dev python3 python3-distutils python3-pip lcov
2626
pip install trimesh pytest
27-
- uses: actions/checkout@v3
27+
- uses: actions/checkout@v4
2828
with:
2929
submodules: recursive
30-
- uses: jwlawson/actions-setup-cmake@v1.12
30+
- uses: jwlawson/actions-setup-cmake@v2
3131
- name: Build ${{matrix.backend}}
3232
if: matrix.parallel_backend != 'NONE'
3333
run: |
@@ -60,7 +60,7 @@ jobs:
6060
lcov --add-tracefile ./code_coverage_init.info --add-tracefile ./code_coverage_test.info --output-file ./code_coverage_total.info
6161
lcov --remove ./code_coverage_total.info '/usr/*' '*/third_party/*' '*/test/*' '*/extras/*' '*/bindings/*' --output-file ./code_coverage.info
6262
cd ../
63-
- uses: codecov/codecov-action@v2
63+
- uses: codecov/codecov-action@v4
6464
if: matrix.parallel_backend == 'NONE'
6565
with:
6666
files: build/code_coverage.info
@@ -82,10 +82,10 @@ jobs:
8282
run: |
8383
sudo apt-get -y update
8484
DEBIAN_FRONTEND=noninteractive sudo apt install -y libgtest-dev libglm-dev libassimp-dev git libtbb-dev pkg-config libpython3-dev python3 python3-distutils python3-pip
85-
- uses: actions/checkout@v3
85+
- uses: actions/checkout@v4
8686
with:
8787
submodules: recursive
88-
- uses: jwlawson/actions-setup-cmake@v1.12
88+
- uses: jwlawson/actions-setup-cmake@v2
8989
- name: Build C bindings with TBB
9090
run: |
9191
mkdir build
@@ -105,7 +105,7 @@ jobs:
105105
run: |
106106
sudo apt-get -y update
107107
DEBIAN_FRONTEND=noninteractive sudo apt install -y nodejs libglm-dev
108-
- uses: actions/checkout@v3
108+
- uses: actions/checkout@v4
109109
with:
110110
submodules: recursive
111111
- name: Setup WASM
@@ -115,7 +115,7 @@ jobs:
115115
cd emsdk
116116
./emsdk install 3.1.45
117117
./emsdk activate 3.1.45
118-
- uses: jwlawson/actions-setup-cmake@v1.12
118+
- uses: jwlawson/actions-setup-cmake@v2
119119
- name: Build WASM
120120
run: |
121121
source ./emsdk/emsdk_env.sh
@@ -134,7 +134,7 @@ jobs:
134134
npm test
135135
cp ../manifold.* ./dist/
136136
- name: Upload WASM files
137-
uses: actions/upload-artifact@v3
137+
uses: actions/upload-artifact@v4
138138
with:
139139
name: wasm
140140
path: bindings/wasm/examples/dist/
@@ -149,10 +149,10 @@ jobs:
149149
runs-on: windows-2019
150150
if: github.event.pull_request.draft == false
151151
steps:
152-
- uses: actions/checkout@v3
152+
- uses: actions/checkout@v4
153153
with:
154154
submodules: recursive
155-
- uses: jwlawson/actions-setup-cmake@v1.12
155+
- uses: jwlawson/actions-setup-cmake@v2
156156
- uses: ilammy/msvc-dev-cmd@v1
157157
- name: Build ${{matrix.backend}}
158158
shell: powershell
@@ -182,7 +182,7 @@ jobs:
182182
runs-on: ubuntu-latest
183183
container: openscad/mxe-x86_64-gui:latest
184184
steps:
185-
- uses: actions/checkout@v3
185+
- uses: actions/checkout@v4
186186
with:
187187
submodules: recursive
188188
- name: Build
@@ -210,10 +210,10 @@ jobs:
210210
- name: Install TBB
211211
if: matrix.parallel_backend == 'TBB'
212212
run: brew install tbb
213-
- uses: actions/checkout@v3
213+
- uses: actions/checkout@v4
214214
with:
215215
submodules: recursive
216-
- uses: jwlawson/actions-setup-cmake@v1.12
216+
- uses: jwlawson/actions-setup-cmake@v2
217217
- name: Build
218218
run: |
219219
mkdir build
@@ -239,7 +239,7 @@ jobs:
239239
runs-on: ubuntu-latest
240240
if: github.event.pull_request.draft == false
241241
steps:
242-
- uses: actions/checkout@v3
242+
- uses: actions/checkout@v4
243243
with:
244244
submodules: recursive
245245
- uses: cachix/install-nix-action@v22
@@ -250,7 +250,7 @@ jobs:
250250
runs-on: ubuntu-latest
251251
if: github.event.pull_request.draft == false
252252
steps:
253-
- uses: actions/checkout@v3
253+
- uses: actions/checkout@v4
254254
with:
255255
submodules: recursive
256256
- uses: cachix/install-nix-action@v22

‎.github/workflows/publish_npm.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ jobs:
1010
runs-on: ubuntu-22.04
1111

1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414

1515
- name: Setup Node
16-
uses: actions/setup-node@v2
16+
uses: actions/setup-node@v4
1717
with:
1818
node-version: '20.x'
1919
registry-url: 'https://registry.npmjs.org'
2020

2121
- name: Download built examples
22-
uses: dawidd6/action-download-artifact@v2
22+
uses: dawidd6/action-download-artifact@v3
2323
with:
2424
workflow: manifold.yml
2525
workflow_conclusion: completed

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ endif()
128128

129129
set(MANIFOLD_VERSION_MAJOR 2)
130130
set(MANIFOLD_VERSION_MINOR 4)
131-
set(MANIFOLD_VERSION_PATCH 0)
131+
set(MANIFOLD_VERSION_PATCH 1)
132132
set(MANIFOLD_VERSION "${MANIFOLD_VERSION_MAJOR}.${MANIFOLD_VERSION_MINOR}.${MANIFOLD_VERSION_PATCH}")
133133
set_property(TARGET manifold PROPERTY VERSION "${MANIFOLD_VERSION}")
134134
set_property(TARGET manifold PROPERTY SOVERSION 2)

‎bindings/wasm/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "manifold-3d",
3-
"version": "2.4.0",
3+
"version": "2.4.1",
44
"description": "Geometry library for topological robustness",
55
"main": "manifold.js",
66
"files": [

‎flake.nix

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
}: pkgs.stdenv.mkDerivation {
3434
inherit doCheck;
3535
pname = "manifold-${parallel-backend}";
36-
version = "2.4.0";
36+
version = "2.4.1";
3737
src = self;
3838
nativeBuildInputs = (with pkgs; [
3939
cmake
@@ -86,7 +86,7 @@
8686
parallelBackends)) // {
8787
manifold-js = pkgs.buildEmscriptenPackage {
8888
name = "manifold-js";
89-
version = "2.4.0";
89+
version = "2.4.1";
9090
src = self;
9191
nativeBuildInputs = (with pkgs; [ cmake python39 ]);
9292
buildInputs = [ pkgs.nodejs ];
@@ -120,7 +120,7 @@
120120
# but how should we make it work with other python versions?
121121
manifold3d = with pkgs.python3Packages; buildPythonPackage {
122122
pname = "manifold3d";
123-
version = "2.4.0";
123+
version = "2.4.1";
124124
src = self;
125125
propagatedBuildInputs = [
126126
numpy

‎pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "manifold3d"
3-
version = "2.4.0"
3+
version = "2.4.1"
44
authors = [
55
{ name="Emmett Lalish", email="[email protected]" },
66
]

‎test-cmake.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ cd cmake-consumer
55
cat <<EOT >> CMakeLists.txt
66
cmake_minimum_required(VERSION 3.18)
77
project(testing LANGUAGES CXX)
8-
find_package(manifold "2.4.0" REQUIRED)
8+
find_package(manifold "2.4.1" REQUIRED)
99
add_executable(testing test.cpp)
1010
target_link_libraries(testing PRIVATE manifold)
1111
EOT

0 commit comments

Comments
 (0)