Skip to content

Commit 35d785b

Browse files
committed
skip windows arm builds for now due to qt linking issue
1 parent 5b75890 commit 35d785b

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

.github/workflows/release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@ jobs:
6767
BOOST_B2_OPTIONS: "address-model=64"
6868
TBB_ENABLE_IPO: "OFF"
6969
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"
70-
- os: "windows-11-arm"
71-
shell: "msys2 {0}"
72-
BOOST_INSTALL_PREFIX: "C:/smelibs"
73-
BOOST_B2_OPTIONS: "address-model=64"
74-
TBB_ENABLE_IPO: "OFF"
75-
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"
70+
# - os: "windows-11-arm"
71+
# shell: "msys2 {0}"
72+
# BOOST_INSTALL_PREFIX: "C:/smelibs"
73+
# BOOST_B2_OPTIONS: "address-model=64"
74+
# TBB_ENABLE_IPO: "OFF"
75+
# 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"
7676
defaults:
7777
run:
7878
shell: ${{ matrix.shell }}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Get the latest versions here:
3939
- osx (Xcode 14.3 / macOS 13): [sme_deps_common_osx.tgz](https://github.com/spatial-model-editor/sme_deps_common/releases/latest/download/sme_deps_common_osx.tgz)
4040
- 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)
4141
- win64-mingw (mingw-w64-x86_64-gcc 15): [sme_deps_common_win64-mingw.tgz](https://github.com/spatial-model-editor/sme_deps_common/releases/latest/download/sme_deps_common_win64-mingw.tgz)
42-
- win64-arm64 (mingw-w64-aarch64-clang 20): [sme_deps_common_win64-arm64.tgz](https://github.com/spatial-model-editor/sme_deps_common/releases/latest/download/sme_deps_common_win64-arm64.tgz)
42+
~- win64-arm64 (mingw-w64-aarch64-clang 20): [sme_deps_common_win64-arm64.tgz](https://github.com/spatial-model-editor/sme_deps_common/releases/latest/download/sme_deps_common_win64-arm64.tgz)~
4343

4444

4545
## Updating this repo

build.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -529,10 +529,10 @@ wget https://github.com/spatial-model-editor/spatial-model-editor.github.io/rele
529529
# workaround for msys2 (`tar xf file.tar.xz` hangs): https://github.com/msys2/MSYS2-packages/issues/1548
530530
xz -dc gmp-${GMP_VERSION}.tar.xz | tar -x --file=-
531531
cd gmp-${GMP_VERSION}
532-
# patch for configure error with gcc15 as it defaults to c23 (from https://gitlab.archlinux.org/archlinux/packaging/packages/gmp/-/blob/main/gmp-gcc-15.patch?ref_type=heads)
533-
git apply --ignore-space-change --ignore-whitespace --verbose ../gmp.diff
534-
# regenerate configure script
535-
autoreconf -i -f
532+
# note: includes this patch for configure error with gcc15 as it defaults to c23 (from https://gitlab.archlinux.org/archlinux/packaging/packages/gmp/-/blob/main/gmp-gcc-15.patch?ref_type=heads)
533+
# (the following two commands were ran on the files hosted above)
534+
### git apply --ignore-space-change --ignore-whitespace --verbose ../gmp.diff
535+
### autoreconf -i -f
536536
./configure \
537537
--prefix=$INSTALL_PREFIX \
538538
--disable-shared \

0 commit comments

Comments
 (0)