aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenjiro Nakayama <nakayamakenjiro@gmail.com>2024-12-17 18:31:06 +0900
committerKenjiro Nakayama <nakayamakenjiro@gmail.com>2024-12-18 08:57:15 +0900
commit3e6153a55211a2590052664ba1b4093aaa97fc83 (patch)
tree80a535f4403769933d4a5a08b597dbb62d0138e9
parentf46d437e5149fced7b0c71a4c40a1b2fbb78dc90 (diff)
downloadportable-3e6153a55211a2590052664ba1b4093aaa97fc83.tar.gz
portable-3e6153a55211a2590052664ba1b4093aaa97fc83.tar.bz2
portable-3e6153a55211a2590052664ba1b4093aaa97fc83.zip
unset CC only for mingw and arm32
Since `scripts/test` always unset "CC", the github action for "clang" in Linux does not use clang unintentionally. This patch unset CC only for mingw{32,64} and arm32.
-rw-r--r--.github/workflows/linux.yml3
-rwxr-xr-xscripts/test5
2 files changed, 7 insertions, 1 deletions
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 0c9a699..af7dfab 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -32,6 +32,9 @@ jobs:
32 - os: "ubuntu-22.04" 32 - os: "ubuntu-22.04"
33 arch: "native" 33 arch: "native"
34 compiler: "clang" 34 compiler: "clang"
35 - os: "ubuntu-24.04"
36 arch: "native"
37 compiler: "clang"
35 steps: 38 steps:
36 - name: "Checkout repository" 39 - name: "Checkout repository"
37 uses: actions/checkout@v4 40 uses: actions/checkout@v4
diff --git a/scripts/test b/scripts/test
index e389728..abfa038 100755
--- a/scripts/test
+++ b/scripts/test
@@ -2,7 +2,10 @@
2set -e 2set -e
3set -x 3set -x
4 4
5unset CC 5if [ "$ARCH" = "mingw32" ] || [ "$ARCH" = "mingw64" ] || [ "$ARCH" = "arm32" ]; then
6 unset CC
7fi
8
6ENABLE_ASM="${ENABLE_ASM:=ON}" 9ENABLE_ASM="${ENABLE_ASM:=ON}"
7 10
8if type apt-get >/dev/null 2>&1; then 11if type apt-get >/dev/null 2>&1; then