diff options
| author | Theo Buehler <tb@openbsd.org> | 2024-12-18 01:54:37 +0100 |
|---|---|---|
| committer | Theo Buehler <tb@openbsd.org> | 2024-12-18 01:54:37 +0100 |
| commit | c8bb0114707a17ddb2d4a7a62deef2622252a05e (patch) | |
| tree | 9611d80cb3608d57d1402ecc80e0aa27aa563047 | |
| parent | 6ac24f23c9fb1e486eae02babbce230b3ebd23ae (diff) | |
| parent | 12031e4e9a1f46ae41d936e2f1a5261a95cb85f8 (diff) | |
| download | portable-c8bb0114707a17ddb2d4a7a62deef2622252a05e.tar.gz portable-c8bb0114707a17ddb2d4a7a62deef2622252a05e.tar.bz2 portable-c8bb0114707a17ddb2d4a7a62deef2622252a05e.zip | |
Land #1229 - unset CC only for mingw and arm32
| -rw-r--r-- | .github/workflows/linux.yml | 3 | ||||
| -rwxr-xr-x | scripts/test | 13 |
2 files changed, 11 insertions, 5 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..1fb02eb 100755 --- a/scripts/test +++ b/scripts/test | |||
| @@ -2,7 +2,14 @@ | |||
| 2 | set -e | 2 | set -e |
| 3 | set -x | 3 | set -x |
| 4 | 4 | ||
| 5 | unset CC | 5 | if [ "$ARCH" = "" ]; then |
| 6 | ARCH=`uname -m` | ||
| 7 | fi | ||
| 8 | |||
| 9 | if [ "$ARCH" = "mingw32" -o "$ARCH" = "mingw64" -o "$ARCH" = "arm32" ]; then | ||
| 10 | unset CC | ||
| 11 | fi | ||
| 12 | |||
| 6 | ENABLE_ASM="${ENABLE_ASM:=ON}" | 13 | ENABLE_ASM="${ENABLE_ASM:=ON}" |
| 7 | 14 | ||
| 8 | if type apt-get >/dev/null 2>&1; then | 15 | if type apt-get >/dev/null 2>&1; then |
| @@ -15,10 +22,6 @@ fi | |||
| 15 | 22 | ||
| 16 | VERSION=`cat VERSION` | 23 | VERSION=`cat VERSION` |
| 17 | 24 | ||
| 18 | if [ "$ARCH" = "" ]; then | ||
| 19 | ARCH=`uname -m` | ||
| 20 | fi | ||
| 21 | |||
| 22 | # test macOS | 25 | # test macOS |
| 23 | if [ `uname` = "Darwin" ]; then | 26 | if [ `uname` = "Darwin" ]; then |
| 24 | # test autotools | 27 | # test autotools |
