Skip to content

Commit

Permalink
Merge pull request #477 from ocaml-multicore/option-musl
Browse files Browse the repository at this point in the history
Add workflows with musl option
  • Loading branch information
jmid authored Dec 18, 2024
2 parents 31e2560 + c0e556e commit b35c545
Show file tree
Hide file tree
Showing 8 changed files with 101 additions and 1 deletion.
12 changes: 12 additions & 0 deletions .github/runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ setup() {
sudo apt-get install pkg-config:i386 libzstd1:i386 libzstd-dev:i386 \
libgcc-s1:i386 gcc-multilib g++-multilib
;;
linux,*musl*)
sudo apt-get update
sudo apt-get install musl-tools
;;
esac
}

Expand Down Expand Up @@ -134,6 +138,14 @@ build_ocaml() {
exit 1
fi
;;
linux,*musl*)
printf 'Running: %s\n' \
"./configure \"CC=musl-gcc\" \"CFLAGS=-Os\" \"ASPP=musl-gcc -c\" $opts"
if ! ./configure "CC=musl-gcc" "CFLAGS=-Os" "ASPP=musl-gcc -c" $opts ; then
cat config.log
exit 1
fi
;;
*) # linux, macos, default options
printf 'Running: %s\n' "./configure $opts"
if ! ./configure $opts ; then
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
options:
description: >-
Configuration options for the compiler.
Space-separated list of '32bit', 'bytecode-only', 'fp'.
Space-separated list of '32bit', 'bytecode-only', 'fp', 'musl'.
type: string
default: ''
platform:
Expand Down
15 changes: 15 additions & 0 deletions .github/workflows/linux-500-musl.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: musl 5.0.0

on:
schedule:
# Every Sunday morning, at 1:11 UTC
- cron: '11 1 * * 0'
workflow_dispatch:

jobs:
build:
uses: ./.github/workflows/common.yml
with:
compiler_ref: refs/tags/5.0.0
options: musl
timeout: 240
15 changes: 15 additions & 0 deletions .github/workflows/linux-51x-musl.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: musl 5.1

on:
schedule:
# Every Sunday morning, at 2:22 UTC
- cron: '22 2 * * 0'
workflow_dispatch:

jobs:
build:
uses: ./.github/workflows/common.yml
with:
compiler_ref: refs/tags/5.1.1
options: musl
timeout: 240
15 changes: 15 additions & 0 deletions .github/workflows/linux-520-musl.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: musl 5.2

on:
schedule:
# Every Monday morning, at 1:11 UTC
- cron: '11 1 * * 1'
workflow_dispatch:

jobs:
build:
uses: ./.github/workflows/common.yml
with:
compiler_ref: refs/tags/5.2.0
options: musl
timeout: 240
19 changes: 19 additions & 0 deletions .github/workflows/linux-530-trunk-musl.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: musl 5.3

on:
schedule:
# Every Monday morning, at 2:22 UTC
- cron: '22 2 * * 1'
pull_request:
push:
branches:
- main
workflow_dispatch:

jobs:
build:
uses: ./.github/workflows/common.yml
with:
compiler_ref: refs/heads/5.3
options: musl
timeout: 240
19 changes: 19 additions & 0 deletions .github/workflows/linux-540-trunk-musl.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: musl trunk

on:
schedule:
# Every Monday morning, at 3:33 UTC
- cron: '33 3 * * 1'
pull_request:
push:
branches:
- main
workflow_dispatch:

jobs:
build:
uses: ./.github/workflows/common.yml
with:
compiler_ref: refs/heads/trunk
options: musl
timeout: 240
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Multicore tests
[![macOS-ARM64 5.0.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-500.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-500.yml)
[![Linux 5.0.0-bytecode](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500-bytecode.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500-bytecode.yml)
[![Linux 5.0.0-debug](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500-debug.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500-debug.yml)
[![Linux 5.0.0-musl](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500-musl.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500-musl.yml)
[![Linux 32-bit 5.0.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500-32bit.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500-32bit.yml)
[![MinGW 5.0.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-500.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-500.yml)
[![MinGW 5.0.0-bytecode](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-500-bytecode.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-500-bytecode.yml)
Expand All @@ -17,6 +18,7 @@ Multicore tests
[![macOS-ARM64 5.1.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-51x.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-51x.yml)
[![Linux 5.1.0-bytecode](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x-bytecode.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x-bytecode.yml)
[![Linux 5.1.0-debug](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x-debug.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x-debug.yml)
[![Linux 5.1.0-musl](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x-musl.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x-musl.yml)
[![Linux 32-bit 5.1.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x-32bit.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x-32bit.yml)
[![Linux FP 5.1.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x-fp.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x-fp.yml)
[![MinGW 5.1.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-51x.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-51x.yml)
Expand All @@ -28,6 +30,7 @@ Multicore tests
[![macOS-ARM64 5.2.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-520.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-520.yml)
[![Linux 5.2.0-bytecode](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-bytecode.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-bytecode.yml)
[![Linux 5.2.0-debug](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-debug.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-debug.yml)
[![Linux 5.2.0-musl](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-musl.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-musl.yml)
[![Linux 32-bit 5.2.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-32bit.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-32bit.yml)
[![Linux FP 5.2.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-fp.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-fp.yml)
[![MinGW 5.2.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-520.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-520.yml)
Expand All @@ -39,6 +42,7 @@ Multicore tests
[![macOS-ARM64 5.3.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-530-trunk.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-530-trunk.yml)
[![Linux 5.3.0+trunk-bytecode](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk-bytecode.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk-bytecode.yml)
[![Linux 5.3.0+trunk-debug](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk-debug.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk-debug.yml)
[![Linux 5.3.0+trunk-musl](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk-musl.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk-musl.yml)
[![Linux 32-bit 5.3.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk-32bit.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk-32bit.yml)
[![Linux FP 5.3.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk-fp.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk-fp.yml)
[![MinGW 5.3.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-530-trunk.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-530-trunk.yml)
Expand All @@ -52,6 +56,7 @@ Multicore tests
[![macOS-ARM64 5.4.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-540-trunk.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-540-trunk.yml)
[![Linux 5.4.0+trunk-bytecode](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-540-trunk-bytecode.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-540-trunk-bytecode.yml)
[![Linux 5.4.0+trunk-debug](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-540-trunk-debug.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-540-trunk-debug.yml)
[![Linux 5.4.0+trunk-musl](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-540-trunk-musl.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-540-trunk-musl.yml)
[![Linux 32-bit 5.4.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-540-trunk-32bit.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-540-trunk-32bit.yml)
[![Linux FP 5.4.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-540-trunk-fp.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-540-trunk-fp.yml)
[![MinGW 5.4.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-540-trunk.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-540-trunk.yml)
Expand Down

0 comments on commit b35c545

Please sign in to comment.