Skip to content

Commit 78b7c7f

Browse files
committed
Specify the correct architecture for the arm64 build.
1 parent 45f00ea commit 78b7c7f

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

.github/workflows/main.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ jobs:
3131
run: 'build/shared/install.Magick.Native.sh "dlemstra" "${{ secrets.GITHUB_TOKEN }}" linux x64'
3232

3333
- name: Build
34-
run: build/shared/build.Magick.NET.sh
34+
run: build/shared/build.Magick.NET.sh x64
3535

3636
- name: Test
3737
run: build/shared/test.Magick.NET.sh
3838

3939
- name: Build OpenMP
40-
run: build/shared/build.Magick.NET.sh OpenMP
40+
run: build/shared/build.Magick.NET.sh x64 OpenMP
4141

4242
- name: Test OpenMP
4343
run: build/shared/test.Magick.NET.sh OpenMP
@@ -64,13 +64,13 @@ jobs:
6464
run: 'build/shared/install.Magick.Native.sh "dlemstra" "${{ secrets.GITHUB_TOKEN }}" linux-musl x64'
6565

6666
- name: Build
67-
run: build/shared/build.Magick.NET.sh
67+
run: build/shared/build.Magick.NET.sh x64
6868

6969
- name: Test
7070
run: build/shared/test.Magick.NET.sh
7171

7272
- name: Build OpenMP
73-
run: build/shared/build.Magick.NET.sh OpenMP
73+
run: build/shared/build.Magick.NET.sh x64 OpenMP
7474

7575
- name: Test OpenMP
7676
run: build/shared/test.Magick.NET.sh OpenMP
@@ -95,13 +95,13 @@ jobs:
9595
run: 'build/shared/install.Magick.Native.sh "dlemstra" "${{ secrets.GITHUB_TOKEN }}" linux arm64'
9696

9797
- name: Build
98-
run: build/shared/build.Magick.NET.sh
98+
run: build/shared/build.Magick.NET.sh arm64
9999

100100
- name: Test
101101
run: build/shared/test.Magick.NET.sh
102102

103103
- name: Build OpenMP
104-
run: build/shared/build.Magick.NET.sh OpenMP
104+
run: build/shared/build.Magick.NET.sh arm64 OpenMP
105105

106106
- name: Test OpenMP
107107
run: build/shared/test.Magick.NET.sh OpenMP
@@ -126,7 +126,7 @@ jobs:
126126
run: 'build/shared/install.Magick.Native.sh "dlemstra" "${{ secrets.GITHUB_TOKEN }}" macos x64'
127127

128128
- name: Build
129-
run: build/shared/build.Magick.NET.sh
129+
run: build/shared/build.Magick.NET.sh x64
130130

131131
- name: Test
132132
run: build/shared/test.Magick.NET.sh
@@ -151,7 +151,7 @@ jobs:
151151
run: 'build/shared/install.Magick.Native.sh "dlemstra" "${{ secrets.GITHUB_TOKEN }}" macos arm64'
152152

153153
- name: Build
154-
run: build/shared/build.Magick.NET.sh
154+
run: build/shared/build.Magick.NET.sh arm64
155155

156156
- name: Test
157157
run: build/shared/test.Magick.NET.sh

build/shared/build.Magick.NET.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
#!/bin/bash
22
set -e
33

4-
openmp=$1
4+
architecture=$1
5+
openmp=$2
56

67
buildMagickNET() {
78
local config=Test$1
89
if [ "$openmp" == "OpenMP" ]; then
910
config=$config-OpenMP
1011
fi
1112

12-
dotnet build tests/Magick.NET.Core.Tests/Magick.NET.Core.Tests.csproj -f net8.0 -c $config
13-
dotnet build tests/Magick.NET.Tests/Magick.NET.Tests.csproj -f net8.0 -c $config
13+
dotnet build tests/Magick.NET.Core.Tests/Magick.NET.Core.Tests.csproj -f net8.0 -c $config --arch $architecture
14+
dotnet build tests/Magick.NET.Tests/Magick.NET.Tests.csproj -f net8.0 -c $config --arch $architecture
1415
}
1516

1617
buildMagickNET "Q8"

0 commit comments

Comments
 (0)