Skip to content

Commit 7b16bdf

Browse files
committed
add linux arm build
1 parent 196ada4 commit 7b16bdf

File tree

3 files changed

+33
-26
lines changed

3 files changed

+33
-26
lines changed

.github/workflows/release.yml

+30-24
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
74-
with:
75-
sme_deps_llvm: "19.1.6"
76-
sme_deps_qt: "6.8.1"
79+
- uses: spatial-model-editor/[email protected].30
80+
# with:
81+
# sme_deps_llvm: "19.1.7"
82+
# sme_deps_qt: "6.8.1-linux-arm"
7783
- uses: actions/checkout@v4
7884
- run: ./build.sh
7985
- uses: actions/upload-artifact@v4

.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

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)

0 commit comments

Comments
 (0)