Skip to content

Commit 6e97c21

Browse files
committed
More adjustments to CI tests
1 parent 8e0a546 commit 6e97c21

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

.github/configs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,9 @@ case "${TARGET_HOST}" in
322322
# No sudo on Windows.
323323
SUDO=""
324324
;;
325+
windows*)
326+
SUDO=""
327+
;;
325328
esac
326329

327330
host=`./config.guess`

.github/workflows/c-cpp.yml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ jobs:
2020
- ubuntu-20.04
2121
- ubuntu-22.04
2222
- ubuntu-24.04
23-
- macos-11
2423
- macos-12
2524
- macos-13
2625
- macos-14
@@ -41,7 +40,7 @@ jobs:
4140
- { target: ubuntu-22.04, config: valgrind-unit }
4241
# binn.c no longer works with c89 so remove this test.
4342
# - { target: ubuntu-22.04, config: c89 }
44-
- { target: ubuntu-22.04, config: clang-6.0 }
43+
- { target: ubuntu-20.04, config: clang-6.0 }
4544
- { target: ubuntu-20.04, config: clang-8 }
4645
- { target: ubuntu-20.04, config: clang-9 }
4746
- { target: ubuntu-20.04, config: clang-10 }
@@ -59,7 +58,13 @@ jobs:
5958
- { target: ubuntu-22.04, config: pam }
6059
- { target: ubuntu-22.04, config: kitchensink }
6160
- { target: ubuntu-22.04, config: hardenedmalloc }
62-
- { target: ubuntu-22.04, config: tcmalloc }
61+
- { target: ubuntu-20.04, config: tcmalloc }
62+
- { target: ubuntu-22.04, config: krb5 }
63+
- { target: ubuntu-22.04, config: heimdal }
64+
- { target: ubuntu-22.04, config: libedit }
65+
- { target: ubuntu-22.04, config: sk }
66+
- { target: ubuntu-22.04, config: selinux }
67+
- { target: ubuntu-22.04, config: without-openssl }
6368
# musl doesn't work because it doesn't know about linux/tcp.h
6469
# - { target: ubuntu-20.04, config: musl }
6570
- { target: ubuntu-latest, config: libressl-master }
@@ -94,14 +99,6 @@ jobs:
9499
- { target: ubuntu-latest, config: putty-0.80 }
95100
- { target: ubuntu-latest, config: putty-snapshot }
96101
- { target: ubuntu-latest, config: zlib-develop }
97-
- { target: ubuntu-22.04, config: pam }
98-
- { target: ubuntu-22.04, config: krb5 }
99-
- { target: ubuntu-22.04, config: heimdal }
100-
- { target: ubuntu-22.04, config: libedit }
101-
- { target: ubuntu-22.04, config: sk }
102-
- { target: ubuntu-22.04, config: selinux }
103-
- { target: ubuntu-22.04, config: kitchensink }
104-
- { target: ubuntu-22.04, config: without-openssl }
105102
# we know pam doesn't work because we can't install a new pam file
106103
# for hpnssh via the CI test methods
107104
# - { target: macos-12, config: pam }

0 commit comments

Comments
 (0)