Skip to content

Commit a51fc28

Browse files
sanguinariojoesanguinariojoe
authored
Merge pull request #358 from FloatingArrayDesign/dev
Release v2.5.0
2 parents d87820d + e7303c8 commit a51fc28

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+8068
-368
lines changed

‎.github/workflows/build-mingw.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
os: [windows-latest]
2222

2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v6
2525

2626
- name: Create folders
2727
run: |

‎.github/workflows/build-test.yml‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
release_id: ${{ steps.create_release.outputs.id }}
2525
upload_url: ${{ steps.create_release.outputs.upload_url }}
2626
steps:
27-
- uses: actions/checkout@v4
27+
- uses: actions/checkout@v6
2828
if: github.event_name == 'push'
2929

3030
- name: moordyn_tag_name
@@ -71,10 +71,10 @@ jobs:
7171
needs: [create_release]
7272
strategy:
7373
matrix:
74-
os: [ubuntu-22.04, windows-latest, macOS-latest]
74+
os: [ubuntu-latest, windows-latest, macos-latest]
7575

7676
steps:
77-
- uses: actions/checkout@v4
77+
- uses: actions/checkout@v6
7878

7979
- name: moordyn_version
8080
id: moordyn_version
@@ -92,6 +92,22 @@ jobs:
9292
compiler: gcc
9393
if: runner.os == 'Linux'
9494

95+
- name: Setup NSIS (Windows)
96+
run: |
97+
iwr -useb get.scoop.sh -outfile 'install.ps1'
98+
.\install.ps1 -RunAsAdmin
99+
scoop update
100+
scoop bucket add extras
101+
scoop install nsis
102+
Add-Content $env:GITHUB_PATH "C:\Users\runneradmin\scoop\shims\"
103+
if: runner.os == 'Windows'
104+
105+
- name: Install Rust-bindgen (Linux)
106+
run: |
107+
sudo apt-get -qq update
108+
sudo apt-get -qq -y install bindgen
109+
if: runner.os == 'Linux'
110+
95111
- name: Install VTK (Linux)
96112
run: |
97113
sudo apt-get -qq update
@@ -104,7 +120,7 @@ jobs:
104120
if: runner.os == 'MacOS'
105121

106122
- name: download pre-built VTK static library
107-
uses: suisei-cn/[email protected].0
123+
uses: suisei-cn/[email protected].1
108124
with:
109125
url: https://github.com/sanguinariojoe/vtk-builds/releases/download/VTK-${{env.VTK_VERSION_MAJOR}}.${{env.VTK_VERSION_MINOR}}.${{env.VTK_VERSION_PATCH}}-static/vtk-${{runner.os}}-x86_64.tar.gz
110126
target: ${{github.workspace}}/

‎.github/workflows/check-version.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
name: Check that the version is valid
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v6
1313

1414
- name: moordyn_version
1515
id: moordyn_version
@@ -21,7 +21,7 @@ jobs:
2121
echo "moordyn_version=$major.$minor.$patch" >> $GITHUB_OUTPUT
2222
2323
- name: Tag check
24-
uses: mukunku/tag-exists-action@v1.6.0
24+
uses: mukunku/tag-exists-action@v1.7.0
2525
id: checkTag
2626
with:
2727
tag: "v${{steps.moordyn_version.outputs.moordyn_version}}"

‎.github/workflows/matlab.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
steps:
2727
- name: Check out repository
28-
uses: actions/checkout@v2
28+
uses: actions/checkout@v6
2929

3030
- name: Create install folder
3131
run: |

‎.github/workflows/mdf_verification.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,19 @@ jobs:
1818
runs-on: ${{ matrix.os }}
1919
strategy:
2020
matrix:
21-
os: [ubuntu-22.04]
21+
os: [ubuntu-latest]
2222

2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v6
25+
26+
- name: Install deps
27+
run: |
28+
sudo apt-get -qq update
29+
sudo apt-get -qq -y install libblas-dev liblapack-dev
30+
if: runner.os == 'Linux'
2531

2632
- name: Setup Python
27-
uses: actions/setup-python@v5
33+
uses: actions/setup-python@v6
2834
id: setup-python
2935

3036
- name: Install Python dependencies

‎.github/workflows/memcheck.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
runs-on: ${{ matrix.os }}
1717
strategy:
1818
matrix:
19-
os: [ubuntu-22.04]
19+
os: [ubuntu-latest]
2020

2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v6
2323

2424
- name: Install valgrind
2525
run: |

‎.github/workflows/python-wheels-emulated.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
description: 'Host OS'
88
required: false
99
type: string
10-
default: '["ubuntu-22.04"]'
10+
default: '["ubuntu-latest"]'
1111
arch:
1212
description: 'Architecture target'
1313
required: true
@@ -75,10 +75,10 @@ jobs:
7575
rm -rf docs extern source tests
7676
7777
steps:
78-
- uses: actions/checkout@v4
78+
- uses: actions/checkout@v6
7979

8080
# Used to host cibuildwheel
81-
- uses: actions/setup-python@v5
81+
- uses: actions/setup-python@v6
8282
with:
8383
python-version: '3.x'
8484

@@ -92,28 +92,28 @@ jobs:
9292
shell: bash
9393

9494
- name: download pre-built VTK static library (ManyLinux)
95-
uses: suisei-cn/[email protected].0
95+
uses: suisei-cn/[email protected].1
9696
with:
9797
url: https://github.com/sanguinariojoe/vtk-builds/releases/download/VTK-${{inputs.vtk_major}}.${{inputs.vtk_minor}}.${{inputs.vtk_patch}}-static/vtk-manylinux2014_${{inputs.arch}}.tar.gz
9898
target: ${{github.workspace}}/
9999
if: runner.os == 'Linux'
100100

101101
- name: download pre-built VTK static library (MUSLLinux)
102-
uses: suisei-cn/[email protected].0
102+
uses: suisei-cn/[email protected].1
103103
with:
104104
url: https://github.com/sanguinariojoe/vtk-builds/releases/download/VTK-${{inputs.vtk_major}}.${{inputs.vtk_minor}}.${{inputs.vtk_patch}}-static/vtk-musllinux_1_2_${{inputs.arch}}.tar.gz
105105
target: ${{github.workspace}}/
106106
if: runner.os == 'Linux'
107107

108108
- name: download pre-built VTK static library (Windows)
109-
uses: suisei-cn/[email protected].0
109+
uses: suisei-cn/[email protected].1
110110
with:
111111
url: https://github.com/sanguinariojoe/vtk-builds/releases/download/VTK-${{inputs.vtk_major}}.${{inputs.vtk_minor}}.${{inputs.vtk_patch}}-static/vtk-Windows-x86_64.tar.gz
112112
target: ${{github.workspace}}/
113113
if: runner.os == 'Windows'
114114

115115
- name: download pre-built VTK static library (MacOS)
116-
uses: suisei-cn/[email protected].0
116+
uses: suisei-cn/[email protected].1
117117
with:
118118
url: https://github.com/sanguinariojoe/vtk-builds/releases/download/VTK-${{inputs.vtk_major}}.${{inputs.vtk_minor}}.${{inputs.vtk_patch}}-static/vtk-macOS-${{inputs.arch}}.tar.gz
119119
target: ${{github.workspace}}/
@@ -142,11 +142,11 @@ jobs:
142142
if: runner.os == 'Linux'
143143

144144
- name: Build wheels
145-
uses: pypa/cibuildwheel@v2.23.1
145+
uses: pypa/cibuildwheel@v3.3.1
146146
with:
147147
output-dir: dist
148148

149-
- uses: actions/upload-artifact@v4
149+
- uses: actions/upload-artifact@v6
150150
id: build_wheels
151151
with:
152152
name: python-wheels-${{runner.os}}_${{inputs.arch}}

‎.github/workflows/python-wheels-test.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
description: 'Host OS'
88
required: false
99
type: string
10-
default: '["ubuntu-22.04"]'
10+
default: '["ubuntu-latest"]'
1111
arch:
1212
description: 'Architecture target'
1313
required: true
@@ -24,14 +24,14 @@ jobs:
2424
os: ${{ fromJSON(inputs.os) }}
2525

2626
steps:
27-
- uses: actions/checkout@v4
27+
- uses: actions/checkout@v6
2828

29-
- uses: actions/setup-python@v5
29+
- uses: actions/setup-python@v6
3030
with:
3131
python-version: '3.12'
3232

3333
- name: Download the wheels
34-
uses: actions/download-artifact@v4
34+
uses: actions/download-artifact@v7
3535
with:
3636
path: dist/
3737
pattern: python-wheels-${{runner.os}}_${{inputs.arch}}*

‎.github/workflows/python-wheels.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
os: [ubuntu-22.04]
1616

1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v6
1919

2020
# Used to host cibuildwheel
21-
- uses: actions/setup-python@v5
21+
- uses: actions/setup-python@v6
2222
with:
2323
python-version: '3.x'
2424

@@ -36,7 +36,7 @@ jobs:
3636
python -m pip install -U pip setuptools
3737
python setup.py sdist
3838
39-
- uses: actions/upload-artifact@v4
39+
- uses: actions/upload-artifact@v6
4040
id: build_wheels
4141
with:
4242
name: python-wheels-sdist
@@ -46,7 +46,7 @@ jobs:
4646
name: Build Linux_x86_64
4747
uses: FloatingArrayDesign/MoorDyn/.github/workflows/python-wheels-emulated.yml@master
4848
with:
49-
os: '["ubuntu-22.04"]'
49+
os: '["ubuntu-latest"]'
5050
arch: "x86_64"
5151
secrets: inherit
5252

@@ -141,10 +141,10 @@ jobs:
141141
os: [ubuntu-22.04]
142142

143143
steps:
144-
- uses: actions/checkout@v4
144+
- uses: actions/checkout@v6
145145

146146
- name: Download artifacts
147-
uses: actions/download-artifact@v4
147+
uses: actions/download-artifact@v7
148148
with:
149149
path: dist/
150150
pattern: python-wheels-*

‎.github/workflows/python-wrapper.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ jobs:
2121
runs-on: ${{ matrix.os }}
2222
strategy:
2323
matrix:
24-
os: [ubuntu-22.04]
24+
os: [ubuntu-latest]
2525

2626
steps:
27-
- uses: actions/checkout@v4
27+
- uses: actions/checkout@v6
2828

2929
- name: Setup Python
30-
uses: actions/setup-python@v5
30+
uses: actions/setup-python@v6
3131
id: setup-python
3232

3333
- name: Install Python dependencies

0 commit comments

Comments
 (0)