Skip to content

Commit 1cc5d96

Browse files
authored
Msvc (#43)
* mingw -> msvc * Add tsan build, use ccache on windows * add windows arm build
1 parent 67509a5 commit 1cc5d96

4 files changed

Lines changed: 1048 additions & 64 deletions

File tree

.github/workflows/release.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
name: Release Builds
22
on: push
33
env:
4+
LLVM_VERSION: "22.1.2"
5+
QT_VERSION: "6.10.2-msvc"
46
LIBSBML_VERSION: "v5.20.5"
57
LIBEXPAT_VERSION: "R_2_7_3"
68
SYMENGINE_VERSION: "add_cudacode_printer"
79
GMP_VERSION: "6.3.0"
810
MPFR_VERSION: "4.2.1"
11+
MPIR_MSVC_VERSION: "f84ce09218b91d4c4fdf26e75093918c9fdb7046"
12+
MPFR_MSVC_VERSION: "f32587226978185abf3df725edbd79da985c7e8c"
913
SPDLOG_VERSION: "v1.15.3"
1014
LIBTIFF_VERSION: "v4.7.1"
1115
FMT_VERSION: "12.0.0"
@@ -39,43 +43,34 @@ jobs:
3943
matrix:
4044
include:
4145
- os: "ubuntu-22.04"
42-
shell: "bash"
4346
BOOST_INSTALL_PREFIX: "/opt/smelibs"
4447
BOOST_BOOTSTRAP_OPTIONS: "--with-toolset=clang"
4548
BOOST_B2_OPTIONS: "cxxflags=-fPIC"
4649
TBB_ENABLE_IPO: "ON"
4750
- os: "ubuntu-22.04"
48-
shell: "bash"
4951
BOOST_INSTALL_PREFIX: "/opt/smelibs"
5052
BOOST_BOOTSTRAP_OPTIONS: "--with-toolset=clang"
5153
BOOST_B2_OPTIONS: "cxxflags=-fPIC"
5254
TBB_ENABLE_IPO: "ON"
5355
TBB_SANITIZE: "thread"
5456
BUILD_TAG: "_tsan"
5557
- os: "ubuntu-22.04-arm"
56-
shell: "bash"
5758
BOOST_INSTALL_PREFIX: "/opt/smelibs"
5859
BOOST_BOOTSTRAP_OPTIONS: "--with-toolset=clang"
5960
BOOST_B2_OPTIONS: "cxxflags=-fPIC"
6061
TBB_ENABLE_IPO: "ON"
6162
- os: "macos-14"
62-
shell: "bash"
6363
BOOST_INSTALL_PREFIX: "/opt/smelibs"
6464
BOOST_B2_OPTIONS: 'cxxflags="-mmacosx-version-min=11" linkflags="-mmacosx-version-min=11"'
6565
TBB_ENABLE_IPO: "ON"
6666
- os: "windows-2022"
67-
shell: "msys2 {0}"
68-
BOOST_INSTALL_PREFIX: "C:/smelibs"
67+
BOOST_INSTALL_PREFIX: "c:/smelibs"
6968
BOOST_B2_OPTIONS: "address-model=64"
70-
TBB_ENABLE_IPO: "OFF"
71-
# - os: "windows-11-arm"
72-
# shell: "msys2 {0}"
73-
# BOOST_INSTALL_PREFIX: "C:/smelibs"
74-
# BOOST_B2_OPTIONS: "address-model=64"
75-
# TBB_ENABLE_IPO: "OFF"
76-
defaults:
77-
run:
78-
shell: ${{ matrix.shell }}
69+
TBB_ENABLE_IPO: "ON"
70+
- os: "windows-11-arm"
71+
BOOST_INSTALL_PREFIX: "c:/smelibs"
72+
BOOST_B2_OPTIONS: "address-model=64 architecture=arm"
73+
TBB_ENABLE_IPO: "ON"
7974
env:
8075
BOOST_INSTALL_PREFIX: ${{ matrix.BOOST_INSTALL_PREFIX }}
8176
BOOST_BOOTSTRAP_OPTIONS: ${{ matrix.BOOST_BOOTSTRAP_OPTIONS }}
@@ -84,14 +79,19 @@ jobs:
8479
TBB_SANITIZE: ${{ matrix.TBB_SANITIZE }}
8580
BUILD_TAG: ${{ matrix.BUILD_TAG }}
8681
steps:
87-
- uses: spatial-model-editor/setup-ci@2026.03.23
82+
- uses: spatial-model-editor/setup-ci@2026.03.27
8883
with:
89-
sme_deps_llvm: "22.1.1"
90-
sme_deps_qt: "6.10.2"
84+
sme_deps_llvm: ${{ env.LLVM_VERSION }}
85+
sme_deps_qt: ${{ env.QT_VERSION }}
9186
build_tag: ${{ matrix.BUILD_TAG }}
9287
cache_id: ${{ matrix.BUILD_TAG }}
9388
- uses: actions/checkout@v6
94-
- run: ./build.sh
89+
- name: Build script
90+
if: runner.os != 'Windows'
91+
run: ./build.sh
92+
- name: Build script
93+
if: runner.os == 'Windows'
94+
run: ./build.ps1
9595
- uses: actions/upload-artifact@v7
9696
with:
9797
name: artifacts-${{ matrix.os }}${{ matrix.BUILD_TAG }}

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ Get the latest versions here:
3838
- 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)
3939
- 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)
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)
41-
- 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)~
41+
- win64 (MSVC / Visual Studio 2022): [sme_deps_common_win64.tgz](https://github.com/spatial-model-editor/sme_deps_common/releases/latest/download/sme_deps_common_win64.tgz)
42+
- win64-arm64 (MSVC / Visual Studio 2022): [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
4646

4747
Any tagged commit will result in a github release.
4848

49-
To make a new release, update the library version numbers in [release.yml](https://github.com/spatial-model-editor/sme_deps_common/blob/main/.github/workflows/release.yml#L6) (and the build script [build.sh](https://github.com/spatial-model-editor/sme_deps_common/blob/main/build.sh) if necessary), then commit the changes:
49+
To make a new release, update the library version numbers in [release.yml](https://github.com/spatial-model-editor/sme_deps_common/blob/main/.github/workflows/release.yml#L6) (and the build scripts [build.sh](https://github.com/spatial-model-editor/sme_deps_common/blob/main/build.sh) / [build.ps1](https://github.com/spatial-model-editor/sme_deps_common/blob/main/build.ps1) if necessary), then commit the changes:
5050

5151
```
5252
git commit -am "revision update"

0 commit comments

Comments
 (0)