Skip to content

Commit 6fcba65

Browse files
committed
upgrade swig for actions
1 parent 2cedefc commit 6fcba65

3 files changed

Lines changed: 14 additions & 7 deletions

File tree

.github/workflows/build_macosx86.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ jobs:
2121
cd boost_1_84_0
2222
./bootstrap.sh
2323
./b2 toolset=clang-darwin target-os=darwin architecture=x86 cxxflags="-arch x86_64" cflags="-arch x86_64" linkflags="-arch x86_64" abi=sysv binary-format=mach-o install
24+
- name: Install Swig
25+
run: |
26+
brew install swig
27+
swig -version
2428
- name: Build ORE CMake
2529
run: |
2630
mkdir build

.github/workflows/macos_ARM64_build.yaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,28 @@ jobs:
2424
cd boost_1_84_0
2525
sudo ./bootstrap.sh
2626
sudo ./b2 architecture=arm address-model=64 -s NO_LZMA=1 -s NO_ZSTD=1 abi=aapcs install
27+
- name: Install Swig
28+
run: |
29+
sudo brew install swig
30+
swig -version
2731
- name: cmake configure and build
2832
run: |
2933
mkdir build
3034
cd build
31-
cmake .. -DCMAKE_OSX_ARCHITECTURES=arm64 -DORE_USE_ZLIB=ON -DORE_BUILD_SWIG=OFF -DORE_BUILD_DOC=OFF -DORE_BUILD_EXAMPLES=OFF -DORE_BUILD_TESTS=OFF -DORE_BUILD_APP=ON -DQL_BUILD_BENCHMARK=OFF -DQL_BUILD_EXAMPLES=OFF -DQL_BUILD_TEST_SUITE=OFF -DQL_ENABLE_SESSIONS=ON -DCMAKE_BUILD_TYPE=Release ..
32-
cmake --build . -j4
33-
cmake --install .
35+
sudo cmake .. -DCMAKE_OSX_ARCHITECTURES=arm64 -DORE_USE_ZLIB=ON -DORE_BUILD_SWIG=OFF -DORE_BUILD_DOC=OFF -DORE_BUILD_EXAMPLES=OFF -DORE_BUILD_TESTS=OFF -DORE_BUILD_APP=ON -DQL_BUILD_BENCHMARK=OFF -DQL_BUILD_EXAMPLES=OFF -DQL_BUILD_TEST_SUITE=OFF -DQL_ENABLE_SESSIONS=ON -DCMAKE_BUILD_TYPE=Release ..
36+
sudo cmake --build . -j4
37+
sudo cmake --install .
3438
- name: Wrap ORE-SWIG for Python Wheels
3539
run: |
3640
pwd
3741
cd ORE-SWIG
38-
python -m pip install setuptools
42+
sudo python -m pip install setuptools
3943
cp ORE-SWIG/wheels/oreanalytics-config.macos ORE-SWIG/oreanalytics-config
4044
cd ORE-SWIG/OREAnalytics-SWIG
4145
ls -al
4246
cd SWIG
4347
ls -al
44-
chmod +x oreanalytics.i
48+
sudo chmod +x oreanalytics.i
4549
cd ..
4650
cd ..
4751
ls -al

ORE-SWIG/Wheels/before_all_linux.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ echo "XYZ END unpack boost"
4444
echo "XYZ BEGIN build ORE"
4545
pwd
4646
ls
47-
cd ORE
4847
mkdir build
4948
cd build
5049
cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DORE_USE_ZLIB=ON -DORE_BUILD_SWIG=OFF -DORE_BUILD_DOC=OFF -DORE_BUILD_EXAMPLES=OFF -DORE_BUILD_TESTS=OFF -DORE_BUILD_APP=OFF -DQL_BUILD_BENCHMARK=OFF -DQL_BUILD_EXAMPLES=OFF -DQL_BUILD_TEST_SUITE=OFF -DQL_ENABLE_SESSIONS=ON -DCMAKE_BUILD_TYPE=Release ..
@@ -56,6 +55,6 @@ echo "XYZ END build ORE"
5655
echo "XYZ BEGIN wrap oreswig"
5756
pwd
5857
ls
59-
cd ORE/ORE-SWIG
58+
cd ORE-SWIG
6059
python setup.py wrap
6160

0 commit comments

Comments
 (0)