diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6b9b328a..7f695874 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,11 +22,13 @@ jobs: run: | sudo apt-get install -y pkg-config libssl-dev musl musl-dev musl-tools rustup target add x86_64-unknown-linux-musl - cargo install --path crates/aiken -F bundle_openssl --target=x86_64-unknown-linux-musl --target-dir dist + cargo install --path=crates/aiken -F bundle_openssl --target=x86_64-unknown-linux-musl + mv $(which aiken) aiken + ldd aiken - uses: actions/upload-artifact@v4 with: name: aiken-${{ github.sha }}-${{ runner.arch }}-${{ runner.os }} - path: dist/release/aiken + path: ./aiken acceptance_tests: runs-on: ubuntu-latest diff --git a/Cargo.toml b/Cargo.toml index 9485d8c1..1475e4c9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ tap = "aiken-lang/homebrew-tap" targets = [ "aarch64-apple-darwin", "x86_64-apple-darwin", - "x86_64-unknown-linux-gnu", + "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc", ] # The archive format to use for windows builds (defaults .zip) @@ -41,13 +41,13 @@ install-path = "~/.aiken/bin" publish-prereleases = true [[workspace.metadata.dist.artifact]] -target = "x86_64-unknown-linux-gnu" -features = ["bundle-openssl"] +target = "x86_64-unknown-linux-musl" +features = ["bundle_openssl"] # Cargo-dist uses ubuntu-20.04 by default, causing issues in various cases # because it links with openssl-1.1 whereas recent distro ships with 3.x [workspace.metadata.dist.github-custom-runners] -x86_64-unknown-linux-gnu = "ubuntu-22.04" +x86_64-unknown-linux-musl = "ubuntu-22.04" [workspace.dependencies] walkdir = "2.3.2"