diff --git a/.cargo/config.toml b/.cargo/config.toml index d02ded7..f05dffb 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,10 +1,10 @@ [target.x86_64-pc-windows-msvc] rustflags = ["-C", "target-feature=+crt-static"] -[target.x86_64-unknown-linux-musl] -rustflags = [ - "-C", - "target-feature=+crt-static", - "-C", - "linker=/opt/x86_64-linux-musl/bin/x86_64-linux-musl-ld", -] +# [target.x86_64-unknown-linux-musl] +# rustflags = [ +# "-C", +# "target-feature=+crt-static", +# "-C", +# "linker=/opt/x86_64-linux-musl/bin/x86_64-linux-musl-ld", +# ] diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8b87742..48359e3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,6 +51,10 @@ jobs: run: scripts/install.sh shell: bash + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 + + - name: Build project run: scripts/build.sh shell: bash diff --git a/scripts/build.sh b/scripts/build.sh index 486142a..0946b2b 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -90,9 +90,9 @@ if [[ "$os_family" == "Windows" ]]; then cargo build --release elif [[ "$os_family" == "Linux" ]]; then ci_dir="$(dirname "$0")" - source "$ci_dir/musl.sh" + # source "$ci_dir/musl.sh" rustup target add x86_64-unknown-linux-musl - cargo build --release --target x86_64-unknown-linux-musl + cargo build --release --target x86_64-unknown-linux-musl ls ./target #./target/x86_64-unknown-linux-musl/release/imagetools else diff --git a/scripts/musl.sh b/scripts/musl.sh index a7bf1e8..2563464 100755 --- a/scripts/musl.sh +++ b/scripts/musl.sh @@ -14,4 +14,5 @@ export NM="/opt/x86_64-linux-musl/bin/x86_64-linux-musl-nm" export SIZE="/opt/x86_64-linux-musl/bin/x86_64-linux-musl-size" export CPP="/opt/x86_64-linux-musl/bin/x86_64-linux-musl-cpp" export AS="/opt/x86_64-linux-musl/bin/x86_64-linux-musl-as" -export F77="/opt/x86_64-linux-musl/bin/x86_64-linux-musl-gfortran" \ No newline at end of file +export F77="/opt/x86_64-linux-musl/bin/x86_64-linux-musl-gfortran" +export LD_LIBRARY_PATH="/opt/x86_64-linux-musl/x86_64-linux-musl/lib:$LD_LIBRARY_PATH" \ No newline at end of file