Skip to content

Commit

Permalink
Merge pull request #483 from JuliaLang/musl-ci-tests
Browse files Browse the repository at this point in the history
Enable ci tests of musl build
  • Loading branch information
davidanthoff authored Nov 27, 2022
2 parents be6719e + c587ce4 commit c50a4af
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 10 deletions.
14 changes: 9 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ jobs:
rustflags:
steps:
- uses: actions/checkout@v3
- if: ${{ contains(matrix.target, '-musl') }}
run: sudo apt-get install musl-tools
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
Expand Down Expand Up @@ -125,7 +127,7 @@ jobs:
x86_64-pc-windows-msvc,
x86_64-apple-darwin,
x86_64-unknown-linux-gnu,
# x86_64-unknown-linux-musl,
x86_64-unknown-linux-musl,
i686-pc-windows-msvc,
]
include:
Expand All @@ -141,16 +143,18 @@ jobs:
os: ubuntu
features: dummy
rustflags:
# - target: x86_64-unknown-linux-musl
# os: ubuntu
# features: dummy
# rustflags: -C target-feature=+crt-static
- target: x86_64-unknown-linux-musl
os: ubuntu
features: dummy
rustflags: -C target-feature=+crt-static
- target: i686-pc-windows-msvc
os: windows
features: dummy
rustflags:
steps:
- uses: actions/checkout@v3
- if: ${{ contains(matrix.target, '-musl') }}
run: sudo apt-get install musl-tools
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
x86_64-pc-windows-msvc,
x86_64-apple-darwin,
x86_64-unknown-linux-gnu,
# x86_64-unknown-linux-musl,
x86_64-unknown-linux-musl,
i686-pc-windows-msvc,
]
include:
Expand All @@ -37,16 +37,18 @@ jobs:
os: ubuntu
features: dummy
rustflags:
# - target: x86_64-unknown-linux-musl
# os: ubuntu
# features: dummy
# rustflags: -C target-feature=+crt-static
- target: x86_64-unknown-linux-musl
os: ubuntu
features: dummy
rustflags: -C target-feature=+crt-static
- target: i686-pc-windows-msvc
os: windows
features: dummy
rustflags:
steps:
- uses: actions/checkout@v3
- if: ${{ contains(matrix.target, '-musl') }}
run: sudo apt-get install musl-tools
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
Expand Down

0 comments on commit c50a4af

Please sign in to comment.