Skip to content

Commit 6d6413b

Browse files
committed
Update version to 3.4.7
- add ARM libs to NuGet package
1 parent 21aab5c commit 6d6413b

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

.github/workflows/nuget.yml

+8-5
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,25 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
os: [ubuntu-20.04, macos-13]
12+
os: [ubuntu-20.04, macos-13, macos-14]
1313
include:
1414
- os: ubuntu-20.04
1515
lib-ext: so
1616
artifact: linux-x64
1717
- os: macos-13
1818
lib-ext: dylib
1919
artifact: osx-x64
20+
- os: macos-14
21+
lib-ext: dylib
22+
artifact: osx-arm64
2023

2124
steps:
2225
- uses: actions/checkout@v4
2326

2427
- uses: lukka/get-cmake@latest
2528

2629
- name: Install OpenMP on macOS
27-
if: matrix.os == 'macos-13'
30+
if: contains(matrix.os, 'macos')
2831
run: HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew reinstall --build-from-source --formula ./libomp.rb
2932

3033
- name: CMake build
@@ -51,13 +54,13 @@ jobs:
5154
include:
5255
- arch: x86
5356
vs-arch: win32
54-
test: 'ON'
57+
test: "ON"
5558
- arch: x64
5659
vs-arch: x64
57-
test: 'ON'
60+
test: "ON"
5861
- arch: arm64
5962
vs-arch: ARM64
60-
test: 'OFF'
63+
test: "OFF"
6164

6265
steps:
6366
- uses: actions/checkout@v4

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ endif()
88
# endif()
99
set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
1010
# set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
11-
project(Thot VERSION 3.4.6 LANGUAGES CXX C)
11+
project(Thot VERSION 3.4.7 LANGUAGES CXX C)
1212

1313
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
1414

nuget/Thot.nuspec

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package>
33
<metadata>
44
<id>Thot</id>
5-
<version>3.4.6</version>
5+
<version>3.4.7</version>
66
<title>Thot</title>
77
<authors>Daniel Ortiz-Martínez,SIL International</authors>
88
<owners>sil-lsdev</owners>
@@ -22,8 +22,10 @@
2222
<file src="Thot.netstandard1.0.props" target="build\netstandard1.0\Thot.props" />
2323
<file src="..\artifacts\win-x86\thot.dll" target="runtimes\win-x86\native" />
2424
<file src="..\artifacts\win-x64\thot.dll" target="runtimes\win-x64\native" />
25+
<file src="..\artifacts\win-arm64\thot.dll" target="runtimes\win-arm64\native" />
2526
<file src="..\artifacts\linux-x64\libthot.so" target="runtimes\linux-x64\native" />
2627
<file src="..\artifacts\osx-x64\libthot.dylib" target="runtimes\osx-x64\native" />
28+
<file src="..\artifacts\osx-arm64\libthot.dylib" target="runtimes\osx-arm64\native" />
2729
<file src="_._" target="lib\net45\_._" />
2830
<file src="_._" target="lib\netstandard1.0\_._" />
2931
</files>

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def build_extension(self, ext):
143143
# logic and declaration, and simpler if you include description/version in a file.
144144
setup(
145145
name="sil-thot",
146-
version="3.4.6",
146+
version="3.4.7",
147147
author="SIL International",
148148
maintainer="Damien Daspit",
149149
maintainer_email="[email protected]",

0 commit comments

Comments
 (0)