Skip to content

Commit b9762e7

Browse files
akenmorrisakenmorris
committed
Merge branch 'master' into acreegan
2 parents bcf1188 + 8a8530e commit b9762e7

File tree

503 files changed

+25122
-340547
lines changed

Some content is hidden

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

503 files changed

+25122
-340547
lines changed

‎.gitattributes‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
*.vtk filter=lfs diff=lfs merge=lfs -text
33
*.dcm filter=lfs diff=lfs merge=lfs -text
44
*.zip filter=lfs diff=lfs merge=lfs -text
5-
65
*.ipynb filter=nbstripout
76
*.ipynb diff=ipynb
7+
*.vtp filter=lfs diff=lfs merge=lfs -text

‎.github/workflows/build-linux-debug.yml‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ jobs:
2828

2929
steps:
3030

31-
- name: Install SSH Key
32-
uses: shimataro/[email protected]
33-
with:
34-
key: ${{ secrets.SSH_PRIVATE_KEY }}
35-
known_hosts: ${{ secrets.KNOWN_HOSTS }}
36-
3731
- name: Conda info
3832
run: conda info
3933

@@ -60,10 +54,6 @@ jobs:
6054
- name: Get tags
6155
run: git fetch --unshallow origin +refs/tags/*:refs/tags/*
6256

63-
- name: Restore Caches
64-
shell: bash -l {0}
65-
run: .github/workflows/restore_caches.sh
66-
6757
- name: Check space3
6858
run: df -h
6959

@@ -83,7 +73,7 @@ jobs:
8373

8474
- name: cmake
8575
shell: bash -l {0}
86-
run: conda activate shapeworks && mkdir build && cd build && cmake -DCMAKE_CXX_FLAGS=-g -DITK_DIR=$HOME/install/lib/cmake/ITK-5.2 -DVTK_DIR=$HOME/install/lib/cmake/vtk-9.1 -DXLNT_DIR=$HOME/install -DLIBIGL_DIR=$HOME/install -DOpenVDB_DIR=$HOME/install/lib/cmake/OpenVDB -DGEOMETRYCENTRAL_DIR=$HOME/install -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBuild_Studio=ON -DJKQTCommonSharedLib_DIR=$HOME/install/lib/cmake/JKQTCommonSharedLib -DJKQTMathTextSharedLib_DIR=$HOME/install/lib/cmake/JKQTMathTextSharedLib -DJKQTPlotterSharedLib_DIR=$HOME/install/lib/cmake/JKQTPlotterSharedLib -DACVD_DIR=$HOME/install -DCMAKE_PREFIX_PATH=${CONDA_PREFIX} -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/shapeworks-install -DUSE_ORIGIN_RPATH=ON ..
76+
run: conda activate shapeworks && mkdir build && cd build && cmake -DCMAKE_CXX_FLAGS=-g -DITK_DIR=$HOME/install/lib/cmake/ITK-5.4 -DVTK_DIR=$HOME/install/lib/cmake/vtk-9.5 -DXLNT_DIR=$HOME/install -DLIBIGL_DIR=$HOME/install -DOpenVDB_DIR=$HOME/install/lib/cmake/OpenVDB -DGEOMETRYCENTRAL_DIR=$HOME/install -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBuild_Studio=ON -DJKQTCommonSharedLib_DIR=$HOME/install/lib/cmake/JKQTCommonSharedLib -DJKQTMathTextSharedLib_DIR=$HOME/install/lib/cmake/JKQTMathTextSharedLib -DJKQTPlotterSharedLib_DIR=$HOME/install/lib/cmake/JKQTPlotterSharedLib -DACVD_DIR=$HOME/install -DCMAKE_PREFIX_PATH=${CONDA_PREFIX} -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/shapeworks-install -DUSE_ORIGIN_RPATH=ON ..
8777

8878
- name: Check space6
8979
run: df -h
@@ -106,9 +96,4 @@ jobs:
10696
- name: make test
10797
shell: bash -l {0}
10898
run: conda activate shapeworks && source ./devenv.sh ./build/bin && cd build && ctest -VV
109-
110-
- name: Store ccache
111-
shell: bash -l {0}
112-
run: .github/workflows/store_ccache.sh
113-
11499

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

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@ jobs:
2929

3030
steps:
3131

32-
- name: Install SSH Key
33-
uses: shimataro/[email protected]
34-
with:
35-
key: ${{ secrets.SSH_PRIVATE_KEY }}
36-
known_hosts: ${{ secrets.KNOWN_HOSTS }}
37-
3832
- name: Conda info
3933
run: conda info
4034

@@ -61,10 +55,6 @@ jobs:
6155
- name: Check space3
6256
run: df -h
6357

64-
- name: Restore Caches
65-
shell: bash -l {0}
66-
run: .github/workflows/restore_caches.sh
67-
6858
- name: Conda Installs
6959
shell: bash -l {0}
7060
run: .github/workflows/gha_conda.sh
@@ -82,7 +72,7 @@ jobs:
8272

8373
- name: cmake
8474
shell: bash -l {0}
85-
run: conda activate shapeworks && mkdir build && cd build && cmake -DCMAKE_CXX_FLAGS=-g -DITK_DIR=$HOME/install/lib/cmake/ITK-5.2 -DVTK_DIR=$HOME/install/lib/cmake/vtk-9.1 -DXLNT_DIR=$HOME/install -DLIBIGL_DIR=$HOME/install -DOpenVDB_DIR=$HOME/install/lib/cmake/OpenVDB -DGEOMETRYCENTRAL_DIR=$HOME/install -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBuild_Studio=ON -DJKQTCommonSharedLib_DIR=$HOME/install/lib/cmake/JKQTCommonSharedLib -DJKQTMathTextSharedLib_DIR=$HOME/install/lib/cmake/JKQTMathTextSharedLib -DJKQTPlotterSharedLib_DIR=$HOME/install/lib/cmake/JKQTPlotterSharedLib -DACVD_DIR=$HOME/install -DCMAKE_PREFIX_PATH=${CONDA_PREFIX} -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/shapeworks-install -DUSE_ORIGIN_RPATH=ON -DGA_MEASUREMENT_ID=$GA_MEASUREMENT_ID -DGA_API_SECRET=$GA_API_SECRET ..
75+
run: conda activate shapeworks && mkdir build && cd build && cmake -DCMAKE_CXX_FLAGS=-g -DITK_DIR=$HOME/install/lib/cmake/ITK-5.4 -DVTK_DIR=$HOME/install/lib/cmake/vtk-9.5 -DXLNT_DIR=$HOME/install -DLIBIGL_DIR=$HOME/install -DOpenVDB_DIR=$HOME/install/lib/cmake/OpenVDB -DGEOMETRYCENTRAL_DIR=$HOME/install -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBuild_Studio=ON -DJKQTCommonSharedLib_DIR=$HOME/install/lib/cmake/JKQTCommonSharedLib -DJKQTMathTextSharedLib_DIR=$HOME/install/lib/cmake/JKQTMathTextSharedLib -DJKQTPlotterSharedLib_DIR=$HOME/install/lib/cmake/JKQTPlotterSharedLib -DACVD_DIR=$HOME/install -DCMAKE_PREFIX_PATH=${CONDA_PREFIX} -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/shapeworks-install -DUSE_ORIGIN_RPATH=ON -DGA_MEASUREMENT_ID=$GA_MEASUREMENT_ID -DGA_API_SECRET=$GA_API_SECRET ..
8676

8777
- name: Check space5
8878
run: df -h
@@ -115,11 +105,7 @@ jobs:
115105
shell: bash -l {0}
116106
run: conda activate shapeworks && source ./devenv.sh ./build/bin && cd build && ctest -VV
117107

118-
- name: Copy artifact
119-
shell: bash -l {0}
120-
run: cd /__w/ShapeWorks/ShapeWorks/artifacts && ${GITHUB_WORKSPACE}/.github/workflows/copy_artifact.sh artifact-${{github.sha}}-linux *
121-
122-
- uses: actions/upload-artifact@v2
108+
- uses: actions/upload-artifact@v4
123109
with:
124110
name: artifact-${{github.sha}}-linux
125111
path: ${{runner.workspace}}/ShapeWorks/artifacts
@@ -135,9 +121,4 @@ jobs:
135121
title: "Development Build for Linux"
136122
files: |
137123
${{runner.workspace}}/ShapeWorks/artifacts/*.tar.gz
138-
139-
- name: Store ccache
140-
shell: bash -l {0}
141-
run: .github/workflows/store_ccache.sh
142-
143124

‎.github/workflows/build-mac-arm64.yml‎

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
name: Mac Arm64 Build
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- release_v*
8+
tags:
9+
- '*'
10+
pull_request:
11+
12+
env:
13+
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
14+
BUILD_TYPE: Release
15+
SW_CLOUD_LOGIN: ${{ secrets.CLOUD_LOGIN }}
16+
CACHE_HOST: ${{ secrets.SSH_HOST }}
17+
GA_MEASUREMENT_ID: ${{ secrets.GA_MEASUREMENT_ID }}
18+
GA_API_SECRET: ${{ secrets.GA_API_SECRET }}
19+
20+
concurrency:
21+
group: ${{ github.workflow }}-${{ github.ref }}
22+
cancel-in-progress: true
23+
24+
jobs:
25+
build:
26+
27+
runs-on: macos-latest
28+
29+
steps:
30+
31+
- name: Setup Miniconda
32+
uses: conda-incubator/[email protected]
33+
34+
- name: OS Setup
35+
run: |
36+
sudo chown -R $UID $CONDA
37+
conda init zsh
38+
source ~/.zshrc
39+
brew install ccache pigz gnu-tar coreutils
40+
41+
- name: Checkout code
42+
uses: actions/checkout@v3
43+
with:
44+
lfs: true
45+
46+
- name: Get tags
47+
run: git fetch --unshallow origin +refs/tags/*:refs/tags/*
48+
49+
- name: Conda Installs
50+
shell: bash -l {0}
51+
run: .github/workflows/gha_conda.sh
52+
53+
- name: Build Dependencies
54+
shell: bash -l {0}
55+
run: .github/workflows/gha_deps.sh
56+
57+
- name: cmake
58+
shell: bash -l {0}
59+
run: conda activate shapeworks && mkdir build && cd build && cmake -DCMAKE_LIBTOOL=/usr/bin/libtool -DCMAKE_CXX_FLAGS="-g -Wno-enum-constexpr-conversion" -DCMAKE_PREFIX_PATH=$HOME/install -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DPython3_ROOT_DIR:FILEPATH=${CONDA_PREFIX} -DUSE_OPENMP=OFF -DBuild_Studio=ON -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/shapeworks-install -DBUILD_DOCUMENTATION=ON -DGA_MEASUREMENT_ID=$GA_MEASUREMENT_ID -DGA_API_SECRET=$GA_API_SECRET ..
60+
61+
- name: make
62+
shell: bash -l {0}
63+
run: conda activate shapeworks && cd build && make -j4
64+
65+
- name: make install
66+
shell: bash -l {0}
67+
run: conda activate shapeworks && cd build && make install
68+
69+
- name: Build Binary Package
70+
shell: bash -l {0}
71+
env:
72+
PR_NUMBER: ${{ github.event.number }}
73+
run: conda activate shapeworks && source ./devenv.sh ./build/bin && ./Support/package.sh tag ${GITHUB_WORKSPACE}/shapeworks-install $HOME/install
74+
75+
- name: Download test data
76+
shell: bash -l {0}
77+
run: .github/workflows/download_test_data.sh
78+
79+
- name: make test
80+
shell: bash -l {0}
81+
run: conda activate shapeworks && source ./devenv.sh ./build/bin && cd build && ctest -VV
82+
83+
- uses: actions/upload-artifact@v4
84+
with:
85+
name: artifact-${{github.sha}}-mac-arm64
86+
path: ${{runner.workspace}}/ShapeWorks/artifacts
87+
88+
- name: Deploy
89+
id: deploy
90+
if: github.ref == 'refs/heads/master'
91+
uses: marvinpinto/action-automatic-releases@latest
92+
with:
93+
repo_token: "${{ secrets.GITHUB_TOKEN }}"
94+
automatic_release_tag: "dev-mac-arm64"
95+
prerelease: true
96+
title: "Development Build for Mac Arm64"
97+
files: |
98+
${{runner.workspace}}/ShapeWorks/artifacts/*.zip
99+
${{runner.workspace}}/ShapeWorks/artifacts/*.pkg
100+
101+
- name: Deploy Docs
102+
if: github.ref == 'refs/heads/master'
103+
shell: bash -l {0}
104+
run: conda activate shapeworks && source ./devenv.sh ./build/bin && ./Support/deploy_docs.sh ${GITHUB_WORKSPACE}/build
105+
env:
106+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
107+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
108+

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

Lines changed: 7 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,21 @@ concurrency:
2424
jobs:
2525
build:
2626

27-
runs-on: macos-latest
27+
runs-on: macos-13
2828

2929
steps:
3030

31-
- name: Install SSH Key
32-
uses: shimataro/ssh-key-action@v2
33-
with:
34-
key: ${{ secrets.SSH_PRIVATE_KEY }}
35-
known_hosts: ${{ secrets.KNOWN_HOSTS }}
36-
31+
- name: Setup Miniconda
32+
uses: conda-incubator/[email protected]
33+
3734
- name: OS Setup
3835
run: |
36+
echo CONDA=$CONDA
3937
sudo chown -R $UID $CONDA
4038
conda init zsh
4139
source ~/.zshrc
4240
brew install ccache pigz gnu-tar coreutils
4341
44-
- name: Acquire 10.15 SDK
45-
run: |
46-
curl -L -o $HOME/MacOSX10.15.sdk.tar.xz https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX10.15.sdk.tar.xz
47-
cd $HOME && tar -xJf MacOSX10.15.sdk.tar.xz
48-
4942
- name: Checkout code
5043
uses: actions/checkout@v3
5144
with:
@@ -54,10 +47,6 @@ jobs:
5447
- name: Get tags
5548
run: git fetch --unshallow origin +refs/tags/*:refs/tags/*
5649

57-
- name: Restore Caches
58-
shell: bash -l {0}
59-
run: .github/workflows/restore_caches.sh
60-
6150
- name: Conda Installs
6251
shell: bash -l {0}
6352
run: .github/workflows/gha_conda.sh
@@ -68,7 +57,7 @@ jobs:
6857

6958
- name: cmake
7059
shell: bash -l {0}
71-
run: conda activate shapeworks && mkdir build && cd build && cmake -DCMAKE_LIBTOOL=/usr/bin/libtool -DCMAKE_CXX_FLAGS=-g -DCMAKE_PREFIX_PATH=$HOME/install -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DPython3_ROOT_DIR:FILEPATH=${CONDA_PREFIX} -DUSE_OPENMP=OFF -DBuild_Studio=ON -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/shapeworks-install -DCMAKE_OSX_SYSROOT="$HOME/MacOSX10.15.sdk" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.15" -DBUILD_DOCUMENTATION=ON -DGA_MEASUREMENT_ID=$GA_MEASUREMENT_ID -DGA_API_SECRET=$GA_API_SECRET ..
60+
run: conda activate shapeworks && mkdir build && cd build && cmake -DCMAKE_LIBTOOL=/usr/bin/libtool -DCMAKE_CXX_FLAGS=-g -DCMAKE_PREFIX_PATH=$HOME/install -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DPython3_ROOT_DIR:FILEPATH=${CONDA_PREFIX} -DUSE_OPENMP=OFF -DBuild_Studio=ON -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/shapeworks-install -DBUILD_DOCUMENTATION=ON -DGA_MEASUREMENT_ID=$GA_MEASUREMENT_ID -DGA_API_SECRET=$GA_API_SECRET ..
7261

7362
- name: make
7463
shell: bash -l {0}
@@ -92,7 +81,7 @@ jobs:
9281
shell: bash -l {0}
9382
run: conda activate shapeworks && source ./devenv.sh ./build/bin && cd build && ctest -VV
9483

95-
- uses: actions/upload-artifact@v2
84+
- uses: actions/upload-artifact@v4
9685
with:
9786
name: artifact-${{github.sha}}-mac
9887
path: ${{runner.workspace}}/ShapeWorks/artifacts
@@ -109,20 +98,3 @@ jobs:
10998
files: |
11099
${{runner.workspace}}/ShapeWorks/artifacts/*.zip
111100
${{runner.workspace}}/ShapeWorks/artifacts/*.pkg
112-
113-
- name: Deploy Docs
114-
if: github.ref == 'refs/heads/master'
115-
shell: bash -l {0}
116-
run: conda activate shapeworks && source ./devenv.sh ./build/bin && ./Support/deploy_docs.sh ${GITHUB_WORKSPACE}/build
117-
env:
118-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
119-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
120-
121-
- name: Store ccache
122-
shell: bash -l {0}
123-
run: .github/workflows/store_ccache.sh
124-
125-
- name: Copy artifact
126-
shell: bash -l {0}
127-
run: cd ${{runner.workspace}}/ShapeWorks && ${GITHUB_WORKSPACE}/.github/workflows/copy_artifact.sh artifact-${{github.sha}}-mac artifacts
128-

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

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ concurrency:
2424
jobs:
2525
build:
2626

27-
runs-on: windows-2019
27+
runs-on: windows-2022
2828

2929
steps:
3030

@@ -39,7 +39,7 @@ jobs:
3939
- name: Init conda
4040
shell: bash -l {0}
4141
run: /c/Miniconda/condabin/conda.bat init --all
42-
42+
4343
# - name: link
4444
# shell: bash -l {0}
4545
# run: cd /usr/bin && ln -s /c/Miniconda/condabin/conda.bat conda
@@ -65,12 +65,6 @@ jobs:
6565
# with:
6666
# miniconda-version: 'latest'
6767

68-
- name: Install SSH Key
69-
uses: shimataro/ssh-key-action@v2
70-
with:
71-
key: ${{ secrets.SSH_PRIVATE_KEY }}
72-
known_hosts: ${{ secrets.KNOWN_HOSTS }}
73-
7468
- name: Checkout code
7569
uses: actions/checkout@v3
7670
with:
@@ -79,16 +73,16 @@ jobs:
7973
- name: Get tags
8074
run: git fetch --unshallow origin +refs/tags/*:refs/tags/*
8175

76+
- name: Download test data
77+
shell: bash -l {0}
78+
run: .github/workflows/download_test_data.sh
79+
8280
- name: Get NSIS
8381
working-directory: ${{runner.workspace}}
8482
run: |
85-
curl -o nsis.zip http://www.sci.utah.edu/~amorris/NSISPortable_3.04.zip
83+
curl -o nsis.zip https://www.sci.utah.edu/~amorris/NSISPortable_3.04.zip
8684
Expand-Archive -LiteralPath nsis.zip -DestinationPath .
8785
88-
- name: Restore Caches
89-
shell: bash -l {0}
90-
run: .github/workflows/restore_caches.sh
91-
9286
- name: Conda Installs
9387
shell: bash -l {0}
9488
run: .github/workflows/gha_conda.sh
@@ -115,7 +109,7 @@ jobs:
115109
# Note the current convention is to use the -S and -B options here to specify source
116110
# and build directories, but this is only available with CMake 3.13 and higher.
117111
# The CMake binaries on the Github Actions machines are (as of this writing) 3.12
118-
run: conda activate shapeworks && cmake $GITHUB_WORKSPACE -DCMAKE_CXX_FLAGS="-FS" -DCMAKE_C_FLAGS="-FS" -DCMAKE_CXX_FLAGS_RELEASE="-FS /Zm500 /Zi /GL /MD /O2 /Ob3 /DNDEBUG /EHsc" -DCMAKE_C_FLAGS_RELEASE="-FS /Zi /GL /MD /O2 /Ob3 /DNDEBUG /EHsc" -DCMAKE_SHARED_LINKER_FLAGS_RELEASE="-LTCG /DEBUG" -DCMAKE_EXE_LINKER_FLAGS_RELEASE="-LTCG /DEBUG" -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DITK_DIR="C:\deps\lib\cmake\ITK-5.2" -DVTK_DIR="C:\deps\lib\cmake\vtk-9.1" -DXLNT_DIR="C:\deps" -DLIBIGL_DIR="C:\deps" -DJKQTCommonSharedLib_DIR="C:/deps/lib/cmake/JKQTCommonSharedLib" -DJKQTMathTextSharedLib_DIR="C:/deps/lib/cmake/JKQTMathTextSharedLib" -DJKQTPlotterSharedLib_DIR="C:/deps/lib/cmake/JKQTPlotterSharedLib" -DOpenVDB_DIR="C:\deps\lib\cmake\OpenVDB" -DGEOMETRYCENTRAL_DIR="C:\deps" -DACVD_DIR="C:\deps" -DBuild_Studio=ON -DGA_MEASUREMENT_ID=$GA_MEASUREMENT_ID -DGA_API_SECRET=$GA_API_SECRET
112+
run: conda activate shapeworks && cmake $GITHUB_WORKSPACE -DCMAKE_CXX_FLAGS="-FS" -DCMAKE_C_FLAGS="-FS" -DCMAKE_CXX_FLAGS_RELEASE="-FS /Zm500 /Zi /GL /MD /O2 /Ob3 /DNDEBUG /EHsc" -DCMAKE_C_FLAGS_RELEASE="-FS /Zi /GL /MD /O2 /Ob3 /DNDEBUG /EHsc" -DCMAKE_SHARED_LINKER_FLAGS_RELEASE="-LTCG /DEBUG" -DCMAKE_EXE_LINKER_FLAGS_RELEASE="-LTCG /DEBUG" -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DITK_DIR="C:\deps\lib\cmake\ITK-5.4" -DVTK_DIR="C:\deps\lib\cmake\vtk-9.5" -DXLNT_DIR="C:\deps" -DLIBIGL_DIR="C:\deps" -DJKQTCommonSharedLib_DIR="C:/deps/lib/cmake/JKQTCommonSharedLib" -DJKQTMathTextSharedLib_DIR="C:/deps/lib/cmake/JKQTMathTextSharedLib" -DJKQTPlotterSharedLib_DIR="C:/deps/lib/cmake/JKQTPlotterSharedLib" -DOpenVDB_DIR="C:\deps\lib\cmake\OpenVDB" -DGEOMETRYCENTRAL_DIR="C:\deps" -DACVD_DIR="C:\deps" -DBuild_Studio=ON -DGA_MEASUREMENT_ID=$GA_MEASUREMENT_ID -DGA_API_SECRET=$GA_API_SECRET
119113

120114
- name: Build
121115
working-directory: "C:/build"
@@ -154,7 +148,7 @@ jobs:
154148
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
155149
run: conda activate shapeworks && source ${GITHUB_WORKSPACE}/devenv.sh ./bin/Release && ctest --output-on-failure -VV -C $BUILD_TYPE --debug
156150

157-
- uses: actions/upload-artifact@v2
151+
- uses: actions/upload-artifact@v4
158152
with:
159153
name: artifact-${{github.sha}}-windows
160154
path: ${{runner.workspace}}\ShapeWorks\artifacts
@@ -174,8 +168,3 @@ jobs:
174168
title: "Development Build for Windows"
175169
files: |
176170
d:/a/ShapeWorks/ShapeWorks/artifacts/*.exe
177-
178-
- name: Copy artifact
179-
shell: bash -l {0}
180-
run: cd /d/a/ShapeWorks/ShapeWorks/artifacts && ${GITHUB_WORKSPACE}/.github/workflows/copy_artifact.sh artifact-${{github.sha}}-windows *
181-

‎.github/workflows/common.sh‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,14 @@ SCRIPT_PATH=`dirname $SCRIPT`
1111

1212
if [[ "$OSTYPE" == "darwin"* ]]; then
1313
source ~/.zshrc
14-
PLATFORM="mac"
15-
CONDA_PATH="/usr/local/miniconda/envs/shapeworks"
14+
# check arch
15+
if [[ "$(uname -m)" == "arm64" ]]; then
16+
PLATFORM="mac-arm64"
17+
CONDA_PATH="/Users/runner/miniconda3/envs/shapeworks"
18+
else
19+
PLATFORM="mac-intel"
20+
CONDA_PATH="/usr/local/miniconda/envs/shapeworks"
21+
fi
1622
DEP_PATH="$HOME/install"
1723
CCACHE_DIR="/Users/runner/Library/Caches/ccache"
1824
USE_CCACHE="ON"

0 commit comments

Comments
 (0)