Skip to content

Commit db4e80c

Browse files
lkeeganlkeegan
committed
add linux arm build
1 parent 196ada4 commit db4e80c

File tree

4 files changed

+32
-39
lines changed

4 files changed

+32
-39
lines changed

Diff for: ‎.github/workflows/release.yml

+29-23
Original file line numberDiff line numberDiff line change
@@ -36,30 +36,36 @@ jobs:
3636
fail-fast: false
3737
matrix:
3838
include:
39-
- os: "ubuntu-22.04"
39+
# - os: "ubuntu-22.04"
40+
# shell: "bash"
41+
# BOOST_INSTALL_PREFIX: "/opt/smelibs"
42+
# BOOST_BOOTSTRAP_OPTIONS: "--with-toolset=clang"
43+
# BOOST_B2_OPTIONS: "cxxflags=-fPIC"
44+
# TBB_ENABLE_IPO: "ON"
45+
- os: "ubuntu-22.04-arm"
4046
shell: "bash"
4147
BOOST_INSTALL_PREFIX: "/opt/smelibs"
4248
BOOST_BOOTSTRAP_OPTIONS: "--with-toolset=clang"
4349
BOOST_B2_OPTIONS: "cxxflags=-fPIC"
4450
TBB_ENABLE_IPO: "ON"
45-
- os: "macos-13"
46-
shell: "bash"
47-
BOOST_INSTALL_PREFIX: "/opt/smelibs"
48-
BOOST_B2_OPTIONS: 'cxxflags="-mmacosx-version-min=11" linkflags="-mmacosx-version-min=11"'
49-
TBB_ENABLE_IPO: "ON"
50-
VTK_OPTIONS: "-DFREETYPE_LIBRARY_RELEASE=/opt/smelibs/lib/libQt6BundledFreetype.a -DFREETYPE_INCLUDE_DIR_freetype2=/opt/smelibs/include/QtFreetype -DFREETYPE_INCLUDE_DIR_ft2build=/opt/smelibs/include/QtFreetype"
51-
- os: "macos-14"
52-
shell: "bash"
53-
BOOST_INSTALL_PREFIX: "/opt/smelibs"
54-
BOOST_B2_OPTIONS: 'cxxflags="-mmacosx-version-min=11" linkflags="-mmacosx-version-min=11"'
55-
TBB_ENABLE_IPO: "ON"
56-
VTK_OPTIONS: "-DFREETYPE_LIBRARY_RELEASE=/opt/smelibs/lib/libQt6BundledFreetype.a -DFREETYPE_INCLUDE_DIR_freetype2=/opt/smelibs/include/QtFreetype -DFREETYPE_INCLUDE_DIR_ft2build=/opt/smelibs/include/QtFreetype"
57-
- os: "windows-2022"
58-
shell: "msys2 {0}"
59-
BOOST_INSTALL_PREFIX: "C:/smelibs"
60-
BOOST_B2_OPTIONS: "address-model=64"
61-
TBB_ENABLE_IPO: "OFF"
62-
VTK_OPTIONS: "-DFREETYPE_LIBRARY_RELEASE=/c/smelibs/lib/libQt6BundledFreetype.a -DFREETYPE_INCLUDE_DIR_freetype2=/c/smelibs/include/QtFreetype -DFREETYPE_INCLUDE_DIR_ft2build=/c/smelibs/include/QtFreetype"
51+
# - os: "macos-13"
52+
# shell: "bash"
53+
# BOOST_INSTALL_PREFIX: "/opt/smelibs"
54+
# BOOST_B2_OPTIONS: 'cxxflags="-mmacosx-version-min=11" linkflags="-mmacosx-version-min=11"'
55+
# TBB_ENABLE_IPO: "ON"
56+
# VTK_OPTIONS: "-DFREETYPE_LIBRARY_RELEASE=/opt/smelibs/lib/libQt6BundledFreetype.a -DFREETYPE_INCLUDE_DIR_freetype2=/opt/smelibs/include/QtFreetype -DFREETYPE_INCLUDE_DIR_ft2build=/opt/smelibs/include/QtFreetype"
57+
# - os: "macos-14"
58+
# shell: "bash"
59+
# BOOST_INSTALL_PREFIX: "/opt/smelibs"
60+
# BOOST_B2_OPTIONS: 'cxxflags="-mmacosx-version-min=11" linkflags="-mmacosx-version-min=11"'
61+
# TBB_ENABLE_IPO: "ON"
62+
# VTK_OPTIONS: "-DFREETYPE_LIBRARY_RELEASE=/opt/smelibs/lib/libQt6BundledFreetype.a -DFREETYPE_INCLUDE_DIR_freetype2=/opt/smelibs/include/QtFreetype -DFREETYPE_INCLUDE_DIR_ft2build=/opt/smelibs/include/QtFreetype"
63+
# - os: "windows-2022"
64+
# shell: "msys2 {0}"
65+
# BOOST_INSTALL_PREFIX: "C:/smelibs"
66+
# BOOST_B2_OPTIONS: "address-model=64"
67+
# TBB_ENABLE_IPO: "OFF"
68+
# VTK_OPTIONS: "-DFREETYPE_LIBRARY_RELEASE=/c/smelibs/lib/libQt6BundledFreetype.a -DFREETYPE_INCLUDE_DIR_freetype2=/c/smelibs/include/QtFreetype -DFREETYPE_INCLUDE_DIR_ft2build=/c/smelibs/include/QtFreetype"
6369
defaults:
6470
run:
6571
shell: ${{ matrix.shell }}
@@ -68,12 +74,12 @@ jobs:
6874
BOOST_BOOTSTRAP_OPTIONS: ${{ matrix.BOOST_BOOTSTRAP_OPTIONS }}
6975
BOOST_B2_OPTIONS: ${{ matrix.BOOST_B2_OPTIONS }}
7076
TBB_ENABLE_IPO: ${{ matrix.TBB_ENABLE_IPO }}
71-
VTK_OPTIONS: ${{ matrix.VTK_OPTIONS }}
77+
# VTK_OPTIONS: ${{ matrix.VTK_OPTIONS }}
7278
steps:
73-
- uses: spatial-model-editor/[email protected].02
79+
- uses: spatial-model-editor/[email protected].31
7480
with:
75-
sme_deps_llvm: "19.1.6"
76-
sme_deps_qt: "6.8.1"
81+
sme_deps_llvm: "19.1.7"
82+
sme_deps_qt: "6.8.1-linux-arm64"
7783
- uses: actions/checkout@v4
7884
- run: ./build.sh
7985
- uses: actions/upload-artifact@v4

Diff for: ‎.pre-commit-config.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ repos:
1111
- id: mixed-line-ending
1212
exclude: '.*\.diff$'
1313
- repo: https://github.com/rhysd/actionlint
14-
rev: v1.7.6
14+
rev: v1.7.7
1515
hooks:
1616
- id: actionlint
1717
- repo: https://github.com/pecigonzalo/pre-commit-shfmt
1818
rev: v2.2.0
1919
hooks:
2020
- id: shell-fmt-go
2121
- repo: https://github.com/google/yamlfmt
22-
rev: v0.14.0
22+
rev: v0.15.0
2323
hooks:
2424
- id: yamlfmt
2525
- repo: https://github.com/cheshirekow/cmake-format-precommit

Diff for: ‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ This repo provides the following statically compiled libraries:
3434
Get the latest versions here:
3535

3636
- linux (clang 19 / Ubuntu 22.04): [sme_deps_common_linux.tgz](https://github.com/spatial-model-editor/sme_deps_common/releases/latest/download/sme_deps_common_linux.tgz)
37+
- linux-arm64 (clang 19 / Ubuntu 22.04): [sme_deps_common_linux-arm64.tgz](https://github.com/spatial-model-editor/sme_deps_common/releases/latest/download/sme_deps_common_linux-arm64.tgz)
3738
- osx (Xcode 15.2 / macOS 13): [sme_deps_common_osx.tgz](https://github.com/spatial-model-editor/sme_deps_common/releases/latest/download/sme_deps_common_osx.tgz)
3839
- osx-arm64 (Xcode 16.1 / macOS 14): [sme_deps_common_osx-arm64.tgz](https://github.com/spatial-model-editor/sme_deps_common/releases/latest/download/sme_deps_common_osx-arm64.tgz)
3940
- win64-mingw (mingw-w64-x86_64-gcc 14): [sme_deps_common_win64-mingw.tgz](https://github.com/spatial-model-editor/sme_deps_common/releases/latest/download/sme_deps_common_win64-mingw.tgz)

Diff for: ‎build.sh

-14
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ cmake -GNinja .. \
125125
-DBENCHMARK_ENABLE_WERROR=OFF \
126126
-DBENCHMARK_ENABLE_TESTING=OFF
127127
time ninja
128-
#make test
129128
${SUDO_CMD} ninja install
130129
cd ../../
131130

@@ -146,7 +145,6 @@ cmake -GNinja .. \
146145
-DCATCH_INSTALL_DOCS=OFF \
147146
-DCATCH_INSTALL_EXTRAS=ON
148147
time ninja
149-
#make test
150148
${SUDO_CMD} ninja install
151149
cd ../../
152150

@@ -268,7 +266,6 @@ cmake -GNinja .. \
268266
-DZLIB_INCLUDE_DIR=$INSTALL_PREFIX/include \
269267
-DZLIB_LIBRARY_RELEASE=$INSTALL_PREFIX/lib/libz.a
270268
time ninja
271-
#make test
272269
${SUDO_CMD} ninja install
273270
cd ../../
274271

@@ -294,7 +291,6 @@ cmake -GNinja .. \
294291
-DTBB_STRICT=OFF \
295292
-DTBB_TEST=OFF
296293
VERBOSE=1 time ninja tbb
297-
#time make test
298294
${SUDO_CMD} ninja install
299295
cd ../../
300296

@@ -334,7 +330,6 @@ cmake -GNinja .. \
334330
-DPAGMO_BUILD_STATIC_LIBRARY=ON \
335331
-DPAGMO_BUILD_TESTS=OFF
336332
VERBOSE=1 time ninja
337-
#time make test
338333
${SUDO_CMD} ninja install
339334
cd ../../
340335

@@ -357,7 +352,6 @@ cmake -GNinja ../expat \
357352
-DEXPAT_SHARED_LIBS=OFF \
358353
-DEXPAT_BUILD_TESTS:BOOL=OFF
359354
time ninja
360-
#make test
361355
${SUDO_CMD} ninja install
362356
cd ../../
363357

@@ -420,7 +414,6 @@ cmake -GNinja .. \
420414
-DZLIB_INCLUDE_DIR=$BOOST_INSTALL_PREFIX/include \
421415
-DZLIB_LIBRARY=$BOOST_INSTALL_PREFIX/lib/libz.a
422416
time ninja
423-
#ninja test
424417
${SUDO_CMD} ninja install
425418
cd ../../
426419

@@ -441,7 +434,6 @@ cmake -GNinja .. \
441434
-DFMT_DOC=OFF \
442435
-DFMT_TEST:BOOL=OFF
443436
time ninja
444-
#make test
445437
${SUDO_CMD} ninja install
446438
cd ../../
447439

@@ -475,7 +467,6 @@ cmake -GNinja .. \
475467
-DGLUT_INCLUDE_DIR=GLUT_INCLUDE_DIR-NOTFOUND \
476468
-DOPENGL_INCLUDE_DIR=OPENGL_INCLUDE_DIR-NOTFOUND
477469
time ninja
478-
#make test
479470
${SUDO_CMD} ninja install
480471
cd ../../
481472

@@ -500,7 +491,6 @@ cmake -GNinja .. \
500491
-DSPDLOG_NO_ATOMIC_LEVELS=ON \
501492
-DCMAKE_PREFIX_PATH=$INSTALL_PREFIX
502493
time ninja
503-
#make test
504494
${SUDO_CMD} ninja install
505495
cd ../../
506496

@@ -519,7 +509,6 @@ cd gmp-${GMP_VERSION}
519509
--with-pic \
520510
--enable-cxx
521511
time make -j$NPROCS
522-
#time make check
523512
${SUDO_CMD} make install
524513
cd ..
525514

@@ -537,7 +526,6 @@ cd mpfr-${MPFR_VERSION}
537526
--with-gmp-lib=$INSTALL_PREFIX/lib \
538527
--with-gmp-include=$INSTALL_PREFIX/include
539528
time make -j$NPROCS
540-
#time make check
541529
${SUDO_CMD} make install
542530
cd ..
543531

@@ -581,7 +569,6 @@ cmake -GNinja .. \
581569
-DWITH_SYMENGINE_THREAD_SAFE=ON \
582570
-DBUILD_TESTS=OFF
583571
time ninja
584-
#time make test
585572
${SUDO_CMD} ninja install
586573
cd ../../
587574

@@ -622,7 +609,6 @@ cmake -GNinja .. \
622609
-DVTK_ENABLE_WRAPPING=OFF \
623610
${VTK_OPTIONS}
624611
time ninja
625-
#make test
626612
${SUDO_CMD} ninja install
627613
cd ../../
628614

0 commit comments

Comments
 (0)