Skip to content

Commit 3842103

Browse files
committed
fixed archs
1 parent 91d7f92 commit 3842103

2 files changed

Lines changed: 14 additions & 21 deletions

File tree

.github/workflows/publish.yml

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ jobs:
2828
- os: windows-2025
2929
arch: x64
3030
OUT_OS_NAME: windows
31-
- os: windows-11-arm
32-
arch: arm64
33-
OUT_OS_NAME: windows
31+
# - os: windows-11-arm
32+
# arch: arm64
33+
# OUT_OS_NAME: windows
3434
fail-fast: false
3535

3636
steps:
@@ -50,14 +50,6 @@ jobs:
5050
uses: julia-actions/setup-julia@v2
5151
with:
5252
version: '1.11'
53-
# arch: >-
54-
# ${{
55-
# matrix.arch == 'x86_64' && 'x64' ||
56-
# matrix.arch == 'aarch64' && 'aarch64' ||
57-
# (matrix.arch == 'arm64' && startsWith(matrix.os, 'macos-')) && 'aarch64' ||
58-
# (matrix.arch == 'arm64') && 'x64' ||
59-
# 'x64'
60-
# }}
6153

6254
- name: Setup JDK
6355
uses: actions/setup-java@v4
@@ -89,21 +81,22 @@ jobs:
8981
shell: bash
9082
run: |
9183
cd swig
92-
# if [[ "${{ matrix.os }}" == ubuntu-* && "${{ matrix.arch }}" == "aarch64" ]]; then
93-
# cmake -DJulia_PREFIX=$JULIA_DIR -DCMAKE_SYSTEM_PROCESSOR=aarch64 -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++ .
94-
# elif [[ "${{ matrix.os }}" == macos-* && "${{ matrix.arch }}" == "x86_64" ]]; then
95-
# cmake -DJulia_PREFIX=$JULIA_DIR -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_SYSTEM_PROCESSOR=x86_64 .
96-
# elif [[ "${{ matrix.os }}" == macos-* && "${{ matrix.arch }}" == "arm64" ]]; then
97-
# cmake -DCMAKE_SYSTEM_PROCESSOR=aarch64 .
98-
# else
99-
# cmake -DCMAKE_SYSTEM_PROCESSOR=${{ matrix.arch }} .
100-
# fi
10184
cmake .
10285
cmake --build . --config Release
10386
cmake --install . --config Release
10487
cd ..
10588
echo "Library built at: $(pwd)/src/main/resources/native/${{ matrix.OUT_OS_NAME }}/${{ matrix.arch }}"
10689
90+
- name: Local test of native library
91+
shell: bash
92+
run: |
93+
if [[ "$RUNNER_OS" == "Windows" ]]; then
94+
./gradlew.bat test
95+
else
96+
./gradlew test
97+
fi
98+
echo "Native library tests passed."
99+
107100
# Add artifact retention period based on release type
108101
- name: Upload artifact
109102
uses: actions/upload-artifact@v4

swig/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ project(Julia4J VERSION 0.0.0.1 LANGUAGES C)
33

44
# Add MSVC fixes here
55
if(MSVC)
6-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /std:clatest")
6+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /std:clatest /experimental:c11atomics")
77
add_definitions(
88
-D_CRT_SECURE_NO_WARNINGS
99
-D_ARM64_WORKAROUND_

0 commit comments

Comments
 (0)