Skip to content

Commit 72a526a

Browse files
committed
fixup! ci: more platforms
1 parent 4469dba commit 72a526a

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

.github/workflows/main.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,38 +46,37 @@ jobs:
4646
- platform: 'ubuntu-latest'
4747
container: 'ghcr.io/libgit2/libgit2/bionic-x86:latest'
4848
qemu: true
49-
env: { CC: 'gcc', CMAKE_OPTIONS: '-DCRYPT=openssl-dynamic -DUNICODE=builtin', LEAK_CHECK: 'valgrind' }
49+
env: { CC: 'gcc', CMAKE_GENERATOR: 'Ninja', CMAKE_OPTIONS: '-DCRYPT=openssl-dynamic -DUNICODE=builtin', LEAK_CHECK: 'valgrind' }
5050

5151
# Linux (x86, Bionic, clang, OpenSSL)
5252
- platform: 'ubuntu-latest'
5353
container: 'ghcr.io/libgit2/libgit2/bionic-x86:latest'
5454
qemu: true
55-
env: { CC: 'clang', CMAKE_OPTIONS: '-DCRYPT=openssl -DUNICODE=iconv', LEAK_CHECK: 'valgrind' }
55+
env: { CC: 'clang', CMAKE_GENERATOR: 'Ninja', CMAKE_OPTIONS: '-DCRYPT=openssl -DUNICODE=iconv', LEAK_CHECK: 'valgrind' }
5656

5757
# Linux (arm32, Bionic, gcc, OpenSSL)
5858
- platform: 'ubuntu-latest'
5959
container: 'ghcr.io/libgit2/libgit2/bionic-arm32:latest'
6060
qemu: true
61-
env: { CC: 'gcc', CMAKE_OPTIONS: '-DCRYPT=openssl -DUNICODE=builtin' }
61+
env: { CC: 'gcc', CMAKE_GENERATOR: 'Ninja', CMAKE_OPTIONS: '-DCRYPT=openssl -DUNICODE=builtin' }
6262

6363
# Linux (arm32, Bionic, gcc, OpenSSL Dynamic)
6464
- platform: 'ubuntu-latest'
6565
container: 'ghcr.io/libgit2/libgit2/bionic-arm32:latest'
6666
qemu: true
67-
env: { CC: 'gcc', CMAKE_OPTIONS: '-DCRYPT=openssl-dynamic -DUNICODE=builtin' }
68-
67+
env: { CC: 'gcc', CMAKE_GENERATOR: 'Ninja', CMAKE_OPTIONS: '-DCRYPT=openssl-dynamic -DUNICODE=builtin' }
6968

7069
# Linux (arm64, Bionic, gcc, OpenSSL)
7170
- platform: 'ubuntu-latest'
7271
container: 'ghcr.io/libgit2/libgit2/bionic-arm64:latest'
7372
qemu: true
74-
env: { CC: 'gcc', CMAKE_OPTIONS: '-DCRYPT=openssl -DUNICODE=builtin' }
73+
env: { CC: 'gcc', CMAKE_GENERATOR: 'Ninja', CMAKE_OPTIONS: '-DCRYPT=openssl -DUNICODE=builtin' }
7574

7675
# Linux (arm64, Bionic, gcc, OpenSSL Dynamic)
7776
- platform: 'ubuntu-latest'
7877
container: 'ghcr.io/libgit2/libgit2/bionic-arm64:latest'
7978
qemu: true
80-
env: { CC: 'gcc', CMAKE_OPTIONS: '-DCRYPT=openssl-dynamic -DUNICODE=builtin' }
79+
env: { CC: 'gcc', CMAKE_GENERATOR: 'Ninja', CMAKE_OPTIONS: '-DCRYPT=openssl-dynamic -DUNICODE=builtin' }
8180

8281
# Linux (amd64, CentOS 7, gcc, OpenSSL)
8382
- platform: 'ubuntu-latest'
@@ -103,7 +102,6 @@ jobs:
103102
qemu: true
104103
env: { CC: 'gcc', CMAKE_OPTIONS: '-DCRYPT=openssl-dynamic -DUNICODE=builtin' }
105104

106-
107105
# macOS
108106
- platform: 'macos-latest'
109107
container: ''

0 commit comments

Comments
 (0)