From 68d6250438cca91f7fde472f66c2126cf97e90cf Mon Sep 17 00:00:00 2001 From: J / Jacob Babich Date: Mon, 7 Oct 2024 01:11:56 -0400 Subject: [PATCH] ci: use workaround for `cc` looking for `musl-g++` by symlinking it like advised in https://github.com/rust-lang/cargo/issues/3359#issuecomment-325614445 --- .github/workflows/check-and-build-and-test.yml | 8 ++++---- .../workflows/compile-and-publish-binaries-to-release.yml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/check-and-build-and-test.yml b/.github/workflows/check-and-build-and-test.yml index 3417cb1..1c021d7 100644 --- a/.github/workflows/check-and-build-and-test.yml +++ b/.github/workflows/check-and-build-and-test.yml @@ -52,18 +52,18 @@ jobs: - runner: macos-latest target: x86_64-apple-darwin - - install_prerequisite: sudo apt-get update && sudo apt-get install musl-dev musl-tools gcc-aarch64-linux-gnu + - install_prerequisite: sudo apt-get update && sudo apt-get install musl-dev musl-tools gcc-aarch64-linux-gnu && sudo ln -s /bin/g++ /bin/musl-g++ runner: ubuntu-latest target: aarch64-unknown-linux-gnu - - install_prerequisite: sudo apt-get update && sudo apt-get install musl-dev musl-tools gcc-aarch64-linux-gnu + - install_prerequisite: sudo apt-get update && sudo apt-get install musl-dev musl-tools gcc-aarch64-linux-gnu && sudo ln -s /bin/g++ /bin/musl-g++ runner: ubuntu-latest target: aarch64-unknown-linux-musl - runner: ubuntu-latest target: x86_64-unknown-linux-gnu - - install_prerequisite: sudo apt-get update && sudo apt-get install musl-dev musl-tools + - install_prerequisite: sudo apt-get update && sudo apt-get install musl-dev musl-tools && sudo ln -s /bin/g++ /bin/musl-g++ runner: ubuntu-latest target: x86_64-unknown-linux-musl @@ -136,7 +136,7 @@ jobs: - runner: ubuntu-latest target: x86_64-unknown-linux-gnu - - install_prerequisite: sudo apt-get update && sudo apt-get install musl-dev musl-tools + - install_prerequisite: sudo apt-get update && sudo apt-get install musl-dev musl-tools && sudo ln -s /bin/g++ /bin/musl-g++ runner: ubuntu-latest target: x86_64-unknown-linux-musl diff --git a/.github/workflows/compile-and-publish-binaries-to-release.yml b/.github/workflows/compile-and-publish-binaries-to-release.yml index a05ad73..7fd3c4f 100644 --- a/.github/workflows/compile-and-publish-binaries-to-release.yml +++ b/.github/workflows/compile-and-publish-binaries-to-release.yml @@ -18,18 +18,18 @@ jobs: - runner: macos-latest target: x86_64-apple-darwin - - install_prerequisite: sudo apt-get update && sudo apt-get install musl-dev musl-tools gcc-aarch64-linux-gnu + - install_prerequisite: sudo apt-get update && sudo apt-get install musl-dev musl-tools gcc-aarch64-linux-gnu && sudo ln -s /bin/g++ /bin/musl-g++ runner: ubuntu-latest target: aarch64-unknown-linux-gnu - - install_prerequisite: sudo apt-get update && sudo apt-get install musl-dev musl-tools gcc-aarch64-linux-gnu + - install_prerequisite: sudo apt-get update && sudo apt-get install musl-dev musl-tools gcc-aarch64-linux-gnu && sudo ln -s /bin/g++ /bin/musl-g++ runner: ubuntu-latest target: aarch64-unknown-linux-musl - runner: ubuntu-latest target: x86_64-unknown-linux-gnu - - install_prerequisite: sudo apt-get update && sudo apt-get install musl-dev musl-tools + - install_prerequisite: sudo apt-get update && sudo apt-get install musl-dev musl-tools && sudo ln -s /bin/g++ /bin/musl-g++ runner: ubuntu-latest target: x86_64-unknown-linux-musl