From ad1d246257b736f30fa08fea52cf6709a3677536 Mon Sep 17 00:00:00 2001 From: Chris Connelly Date: Sun, 30 Oct 2022 23:31:14 +0000 Subject: [PATCH] ci: attempt #2 to fix release builds with C deps --- .github/workflows/release.yaml | 2 +- Cargo.lock | 2 +- Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b32be4d..69203fe 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -50,7 +50,7 @@ jobs: set -euo pipefail echo "$OSXCROSS_PATH/target/bin" >> "$GITHUB_PATH" - echo "CC_$(echo '${{ matrix.arch }}_${{ matrix.os }}' | tr '-' '_')"="$OSXCROSS_PATH/target/bin/o64-clang" >> $GITHUB_ENV + echo "CC_$(echo '${{ matrix.arch }}_${{ matrix.os }}' | tr '-' '_')"="$(find "$OSXCROSS_PATH/target/bin" -name '${{ matrix.arch }}-apple-darwin*-clang' -exec basename {} \;)" >> $GITHUB_ENV echo "CARGO_TARGET_$(echo '${{ matrix.arch }}' | tr '[:lower:]' '[:upper:]')_APPLE_DARWIN_LINKER=$(find "$OSXCROSS_PATH/target/bin" -name '${{ matrix.arch }}-apple-darwin*-clang' -exec basename {} \;)" >> $GITHUB_ENV echo "CARGO_TARGET_$(echo '${{ matrix.arch }}' | tr '[:lower:]' '[:upper:]')_APPLE_DARWIN_RUSTFLAGS=-Car=$(find "$OSXCROSS_PATH/target/bin" -name '${{ matrix.arch }}-apple-darwin*-ar' -exec basename {} \;),-Clink-arg=-undefined,-Clink-arg=dynamic_lookup" >> $GITHUB_ENV env: diff --git a/Cargo.lock b/Cargo.lock index 8609ea7..2d92cbe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -645,7 +645,7 @@ dependencies = [ [[package]] name = "cloudformatious-cli" -version = "0.2.2" +version = "0.2.3" dependencies = [ "async_zip", "atty", diff --git a/Cargo.toml b/Cargo.toml index 6457ef2..beb970b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cloudformatious-cli" -version = "0.2.2" +version = "0.2.3" authors = ["Chris Connelly "] license = "MIT" edition = "2018"