Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "mdbook-angular"
version = "0.4.1"
version = "0.4.2"
edition = "2021"
authors = ["Bram Gotink <bram@bram.dev>"]
license = "EUPL-1.2"
Expand Down
23 changes: 11 additions & 12 deletions scripts/ci/install-rust.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,18 @@ then
rustup component add rust-std-$TARGET --toolchain=$TOOLCHAIN
fi

case "$TARGET" in
aarch64-unknown-linux-musl)
MUSL_DOWNLOAD=https://musl.cc/aarch64-linux-musl-cross.tgz
;;
x86_64-unknown-linux-musl)
MUSL_DOWNLOAD=https://musl.cc/x86_64-linux-musl-cross.tgz
sudo ln -s /usr/local/bin/{x86_64-linux-,}musl-gcc
;;
esac

if [ -n "$MUSL_DOWNLOAD" ]
if [[ $TARGET == *musl ]]
then
# This is needed by libdbus-sys.
sudo apt update -y && sudo apt install musl-dev musl-tools -y
fi
if [[ $TARGET == "aarch64-unknown-linux-musl" ]]
then
curl -SsL "$MUSL_DOWNLOAD" | sudo tar -xvzC /usr/local --strip-components 1
echo CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=rust-lld >> $GITHUB_ENV
# This `CC` is some nonsense needed for libdbus-sys (via opener).
# I don't know if this is really the right thing to do, but it seems to work.
sudo apt install gcc-aarch64-linux-gnu -y
echo CC=aarch64-linux-gnu-gcc >> $GITHUB_ENV
fi
fi

Expand Down
4 changes: 0 additions & 4 deletions scripts/ci/make-release-asset.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ TAG=${GITHUB_REF#*/tags/}

host=$(rustc -Vv | grep ^host: | sed -e "s/host: //g")
target=$2
if [ "$host" != "$target" ]
then
export "CARGO_TARGET_$(echo $target | tr a-z- A-Z_)_LINKER"=rust-lld
fi
export CARGO_PROFILE_RELEASE_LTO=true
cargo build --locked --bin mdbook-angular --release --target $target
cd target/$target/release
Expand Down
Loading