From b9ae8cccb09a2d8d930165893bbaa806636b635f Mon Sep 17 00:00:00 2001 From: Omar Date: Wed, 22 Mar 2023 13:41:33 +0300 Subject: [PATCH 1/7] Update feature logic for builds --- .github/workflows/build.yml | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ced351b4..8e51abd5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,55 +25,55 @@ jobs: custom-linker: "" custom-compiler: /usr/local/opt/llvm/bin/clang custom-archiver: /usr/local/opt/llvm/bin/llvm-ar - features: "" + features: "jni radix-engine" - crate: native-json-interface target-triple: x86_64-apple-ios custom-linker: "" custom-compiler: /usr/local/opt/llvm/bin/clang custom-archiver: /usr/local/opt/llvm/bin/llvm-ar - features: "" + features: "jni radix-engine" - crate: native-json-interface target-triple: x86_64-apple-darwin custom-linker: "" custom-compiler: /usr/local/opt/llvm/bin/clang custom-archiver: /usr/local/opt/llvm/bin/llvm-ar - features: "" + features: "jni radix-engine" - crate: native-json-interface target-triple: aarch64-apple-ios custom-linker: "" custom-compiler: /usr/local/opt/llvm/bin/clang custom-archiver: /usr/local/opt/llvm/bin/llvm-ar - features: "" + features: "jni radix-engine" - crate: native-json-interface target-triple: aarch64-apple-ios-sim custom-linker: "" custom-compiler: /usr/local/opt/llvm/bin/clang custom-archiver: /usr/local/opt/llvm/bin/llvm-ar - features: "" + features: "jni radix-engine" - crate: native-json-interface target-triple: x86_64-pc-windows-gnu custom-linker: "" custom-compiler: x86_64-w64-mingw32-gcc custom-archiver: x86_64-w64-mingw32-ar - features: "" + features: "jni radix-engine" - crate: native-json-interface target-triple: x86_64-unknown-linux-gnu custom-linker: x86_64-unknown-linux-gnu-gcc custom-compiler: /usr/local/opt/llvm/bin/clang custom-archiver: /usr/local/opt/llvm/bin/llvm-ar - features: "" + features: "jni radix-engine" - crate: native-json-interface target-triple: aarch64-unknown-linux-gnu custom-linker: aarch64-unknown-linux-gnu-gcc custom-compiler: aarch64-unknown-linux-gnu-gcc custom-archiver: aarch64-unknown-linux-gnu-gcc-ar - features: "" + features: "jni radix-engine" - crate: native-json-interface target-triple: i686-unknown-linux-gnu custom-linker: i686-unknown-linux-gnu-gcc custom-compiler: i686-unknown-linux-gnu-gcc custom-archiver: i686-unknown-linux-gnu-gcc-ar - features: "" + features: "jni radix-engine" - crate: native-json-interface target-triple: wasm32-unknown-unknown custom-linker: "" @@ -85,19 +85,19 @@ jobs: custom-linker: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android21-clang custom-compiler: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android21-clang custom-archiver: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar - features: "" + features: "jni radix-engine" - crate: native-json-interface target-triple: armv7-linux-androideabi custom-linker: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/armv7a-linux-androideabi19-clang custom-compiler: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/armv7a-linux-androideabi19-clang custom-archiver: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar - features: "" + features: "jni radix-engine" - crate: native-json-interface target-triple: i686-linux-android custom-linker: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/i686-linux-android19-clang custom-compiler: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/i686-linux-android19-clang custom-archiver: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar - features: "" + features: "jni radix-engine" steps: - uses: FranzDiebold/github-env-vars-action@v2 @@ -145,12 +145,16 @@ jobs: export CC=${{ matrix.build-target.custom-compiler }} export AR=${{ matrix.build-target.custom-archiver }} - export features=${{ matrix.build-target.features }} - export features=${features:="default"} + + if [ "${{ matrix.build-target.features }}" = "" ]; then + export features="" + else + export features="--no-default-features --features \"${{ matrix.build-target.features }}\"" + fi cargo build \ --target ${{ matrix.build-target.target-triple }} \ - --release --features $features + --release $features unset $LINKER_ENVIRONMENT_VARIABLE export CC="/usr/local/opt/llvm/bin/clang" From 827d415c55aeb6dfb269a337b305c9a0bee0ef4e Mon Sep 17 00:00:00 2001 From: Omar Date: Wed, 22 Mar 2023 13:54:07 +0300 Subject: [PATCH 2/7] minor fix --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8e51abd5..fb4dea2c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -149,7 +149,7 @@ jobs: if [ "${{ matrix.build-target.features }}" = "" ]; then export features="" else - export features="--no-default-features --features \"${{ matrix.build-target.features }}\"" + export features="--no-default-features --features ${{ matrix.build-target.features }}" fi cargo build \ From 7d21c77802b462bb2c0934ce2f2b6a1ac5b2d05f Mon Sep 17 00:00:00 2001 From: Omar Date: Wed, 22 Mar 2023 14:00:12 +0300 Subject: [PATCH 3/7] separate features by a comma --- .github/workflows/build.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fb4dea2c..f1976d5d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,55 +25,55 @@ jobs: custom-linker: "" custom-compiler: /usr/local/opt/llvm/bin/clang custom-archiver: /usr/local/opt/llvm/bin/llvm-ar - features: "jni radix-engine" + features: "jni,radix-engine" - crate: native-json-interface target-triple: x86_64-apple-ios custom-linker: "" custom-compiler: /usr/local/opt/llvm/bin/clang custom-archiver: /usr/local/opt/llvm/bin/llvm-ar - features: "jni radix-engine" + features: "jni,radix-engine" - crate: native-json-interface target-triple: x86_64-apple-darwin custom-linker: "" custom-compiler: /usr/local/opt/llvm/bin/clang custom-archiver: /usr/local/opt/llvm/bin/llvm-ar - features: "jni radix-engine" + features: "jni,radix-engine" - crate: native-json-interface target-triple: aarch64-apple-ios custom-linker: "" custom-compiler: /usr/local/opt/llvm/bin/clang custom-archiver: /usr/local/opt/llvm/bin/llvm-ar - features: "jni radix-engine" + features: "jni,radix-engine" - crate: native-json-interface target-triple: aarch64-apple-ios-sim custom-linker: "" custom-compiler: /usr/local/opt/llvm/bin/clang custom-archiver: /usr/local/opt/llvm/bin/llvm-ar - features: "jni radix-engine" + features: "jni,radix-engine" - crate: native-json-interface target-triple: x86_64-pc-windows-gnu custom-linker: "" custom-compiler: x86_64-w64-mingw32-gcc custom-archiver: x86_64-w64-mingw32-ar - features: "jni radix-engine" + features: "jni,radix-engine" - crate: native-json-interface target-triple: x86_64-unknown-linux-gnu custom-linker: x86_64-unknown-linux-gnu-gcc custom-compiler: /usr/local/opt/llvm/bin/clang custom-archiver: /usr/local/opt/llvm/bin/llvm-ar - features: "jni radix-engine" + features: "jni,radix-engine" - crate: native-json-interface target-triple: aarch64-unknown-linux-gnu custom-linker: aarch64-unknown-linux-gnu-gcc custom-compiler: aarch64-unknown-linux-gnu-gcc custom-archiver: aarch64-unknown-linux-gnu-gcc-ar - features: "jni radix-engine" + features: "jni,radix-engine" - crate: native-json-interface target-triple: i686-unknown-linux-gnu custom-linker: i686-unknown-linux-gnu-gcc custom-compiler: i686-unknown-linux-gnu-gcc custom-archiver: i686-unknown-linux-gnu-gcc-ar - features: "jni radix-engine" + features: "jni,radix-engine" - crate: native-json-interface target-triple: wasm32-unknown-unknown custom-linker: "" @@ -85,19 +85,19 @@ jobs: custom-linker: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android21-clang custom-compiler: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android21-clang custom-archiver: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar - features: "jni radix-engine" + features: "jni,radix-engine" - crate: native-json-interface target-triple: armv7-linux-androideabi custom-linker: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/armv7a-linux-androideabi19-clang custom-compiler: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/armv7a-linux-androideabi19-clang custom-archiver: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar - features: "jni radix-engine" + features: "jni,radix-engine" - crate: native-json-interface target-triple: i686-linux-android custom-linker: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/i686-linux-android19-clang custom-compiler: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/i686-linux-android19-clang custom-archiver: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar - features: "jni radix-engine" + features: "jni,radix-engine" steps: - uses: FranzDiebold/github-env-vars-action@v2 From b78646d1b76312112cffb727fb1a0206f37a6e4a Mon Sep 17 00:00:00 2001 From: Omar Date: Wed, 22 Mar 2023 17:10:50 +0300 Subject: [PATCH 4/7] use no default features in wasm test --- native-json-interface/tests/toolkit_wasm_wrapper.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/native-json-interface/tests/toolkit_wasm_wrapper.rs b/native-json-interface/tests/toolkit_wasm_wrapper.rs index 65c5b082..0e87f2c7 100644 --- a/native-json-interface/tests/toolkit_wasm_wrapper.rs +++ b/native-json-interface/tests/toolkit_wasm_wrapper.rs @@ -138,7 +138,13 @@ impl RadixEngineToolkit { // release. let status: std::process::ExitStatus = std::process::Command::new("cargo") .current_dir(&manifest_directory) - .args(["build", "--target", "wasm32-unknown-unknown", "--release"]) + .args([ + "build", + "--target", + "wasm32-unknown-unknown", + "--release", + "--no-default-features", + ]) .status() .expect("Compilation of WASM for tests failed"); if !status.success() { From c78304fd565ec45f5f7a0e25f6785ff08a582890 Mon Sep 17 00:00:00 2001 From: Omar Date: Wed, 22 Mar 2023 19:29:20 +0300 Subject: [PATCH 5/7] Update bash script around features --- .github/workflows/build.yml | 5 +++-- radix-engine-toolkit/Cargo.toml | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 334607cb..cb49cf32 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -146,8 +146,9 @@ jobs: export CC=${{ matrix.build-target.custom-compiler }} export AR=${{ matrix.build-target.custom-archiver }} - if [ "${{ matrix.build-target.features }}" = "" ]; then - export features="" + if [ -z "${{ matrix.build-target.features }}" ]; + then + export features="" else export features="--no-default-features --features ${{ matrix.build-target.features }}" fi diff --git a/radix-engine-toolkit/Cargo.toml b/radix-engine-toolkit/Cargo.toml index 560dd9d4..26760eb5 100644 --- a/radix-engine-toolkit/Cargo.toml +++ b/radix-engine-toolkit/Cargo.toml @@ -35,7 +35,6 @@ bech32 = { version = "0.9.0", default-features = false } # Used for more powerful declarative macros paste = { version = "1.0.11" } serde_json = "1.0.91" -getrandom = { version = "0.2.8", features = ["js"], optional = true } [dev-dependencies] lazy_static = { version = "1.4.0" } @@ -43,4 +42,4 @@ serde_json = { version = "1.0.91" } [features] default = ["radix-engine"] -radix-engine = ["dep:radix-engine", "dep:getrandom"] \ No newline at end of file +radix-engine = ["dep:radix-engine"] \ No newline at end of file From e973658d01666e145dffd06d68b1f259bab1a9c7 Mon Sep 17 00:00:00 2001 From: Omar Date: Wed, 22 Mar 2023 21:48:02 +0300 Subject: [PATCH 6/7] print debug statements --- .github/workflows/build.yml | 147 ++++++++++++++++++------------------ 1 file changed, 75 insertions(+), 72 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cb49cf32..15105e0f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,84 +20,84 @@ jobs: matrix: build-target: # native-json-interface Crate - - crate: native-json-interface - target-triple: aarch64-apple-darwin - custom-linker: "" - custom-compiler: /usr/local/opt/llvm/bin/clang - custom-archiver: /usr/local/opt/llvm/bin/llvm-ar - features: "jni,radix-engine" - - crate: native-json-interface - target-triple: x86_64-apple-ios - custom-linker: "" - custom-compiler: /usr/local/opt/llvm/bin/clang - custom-archiver: /usr/local/opt/llvm/bin/llvm-ar - features: "jni,radix-engine" - - crate: native-json-interface - target-triple: x86_64-apple-darwin - custom-linker: "" - custom-compiler: /usr/local/opt/llvm/bin/clang - custom-archiver: /usr/local/opt/llvm/bin/llvm-ar - features: "jni,radix-engine" - - crate: native-json-interface - target-triple: aarch64-apple-ios - custom-linker: "" - custom-compiler: /usr/local/opt/llvm/bin/clang - custom-archiver: /usr/local/opt/llvm/bin/llvm-ar - features: "jni,radix-engine" - - crate: native-json-interface - target-triple: aarch64-apple-ios-sim - custom-linker: "" - custom-compiler: /usr/local/opt/llvm/bin/clang - custom-archiver: /usr/local/opt/llvm/bin/llvm-ar - features: "jni,radix-engine" - - crate: native-json-interface - target-triple: x86_64-pc-windows-gnu - custom-linker: "" - custom-compiler: x86_64-w64-mingw32-gcc - custom-archiver: x86_64-w64-mingw32-ar - features: "jni,radix-engine" - - crate: native-json-interface - target-triple: x86_64-unknown-linux-gnu - custom-linker: x86_64-unknown-linux-gnu-gcc - custom-compiler: /usr/local/opt/llvm/bin/clang - custom-archiver: /usr/local/opt/llvm/bin/llvm-ar - features: "jni,radix-engine" - - crate: native-json-interface - target-triple: aarch64-unknown-linux-gnu - custom-linker: aarch64-unknown-linux-gnu-gcc - custom-compiler: aarch64-unknown-linux-gnu-gcc - custom-archiver: aarch64-unknown-linux-gnu-gcc-ar - features: "jni,radix-engine" - - crate: native-json-interface - target-triple: i686-unknown-linux-gnu - custom-linker: i686-unknown-linux-gnu-gcc - custom-compiler: i686-unknown-linux-gnu-gcc - custom-archiver: i686-unknown-linux-gnu-gcc-ar - features: "jni,radix-engine" + # - crate: native-json-interface + # target-triple: aarch64-apple-darwin + # custom-linker: "" + # custom-compiler: /usr/local/opt/llvm/bin/clang + # custom-archiver: /usr/local/opt/llvm/bin/llvm-ar + # features: "jni,radix-engine" + # - crate: native-json-interface + # target-triple: x86_64-apple-ios + # custom-linker: "" + # custom-compiler: /usr/local/opt/llvm/bin/clang + # custom-archiver: /usr/local/opt/llvm/bin/llvm-ar + # features: "jni,radix-engine" + # - crate: native-json-interface + # target-triple: x86_64-apple-darwin + # custom-linker: "" + # custom-compiler: /usr/local/opt/llvm/bin/clang + # custom-archiver: /usr/local/opt/llvm/bin/llvm-ar + # features: "jni,radix-engine" + # - crate: native-json-interface + # target-triple: aarch64-apple-ios + # custom-linker: "" + # custom-compiler: /usr/local/opt/llvm/bin/clang + # custom-archiver: /usr/local/opt/llvm/bin/llvm-ar + # features: "jni,radix-engine" + # - crate: native-json-interface + # target-triple: aarch64-apple-ios-sim + # custom-linker: "" + # custom-compiler: /usr/local/opt/llvm/bin/clang + # custom-archiver: /usr/local/opt/llvm/bin/llvm-ar + # features: "jni,radix-engine" + # - crate: native-json-interface + # target-triple: x86_64-pc-windows-gnu + # custom-linker: "" + # custom-compiler: x86_64-w64-mingw32-gcc + # custom-archiver: x86_64-w64-mingw32-ar + # features: "jni,radix-engine" + # - crate: native-json-interface + # target-triple: x86_64-unknown-linux-gnu + # custom-linker: x86_64-unknown-linux-gnu-gcc + # custom-compiler: /usr/local/opt/llvm/bin/clang + # custom-archiver: /usr/local/opt/llvm/bin/llvm-ar + # features: "jni,radix-engine" + # - crate: native-json-interface + # target-triple: aarch64-unknown-linux-gnu + # custom-linker: aarch64-unknown-linux-gnu-gcc + # custom-compiler: aarch64-unknown-linux-gnu-gcc + # custom-archiver: aarch64-unknown-linux-gnu-gcc-ar + # features: "jni,radix-engine" + # - crate: native-json-interface + # target-triple: i686-unknown-linux-gnu + # custom-linker: i686-unknown-linux-gnu-gcc + # custom-compiler: i686-unknown-linux-gnu-gcc + # custom-archiver: i686-unknown-linux-gnu-gcc-ar + # features: "jni,radix-engine" - crate: native-json-interface target-triple: wasm32-unknown-unknown custom-linker: "" custom-compiler: /usr/local/opt/llvm/bin/clang custom-archiver: /usr/local/opt/llvm/bin/llvm-ar features: "" - - crate: native-json-interface - target-triple: aarch64-linux-android - custom-linker: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android21-clang - custom-compiler: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android21-clang - custom-archiver: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar - features: "jni,radix-engine" - - crate: native-json-interface - target-triple: armv7-linux-androideabi - custom-linker: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/armv7a-linux-androideabi19-clang - custom-compiler: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/armv7a-linux-androideabi19-clang - custom-archiver: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar - features: "jni,radix-engine" - - crate: native-json-interface - target-triple: i686-linux-android - custom-linker: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/i686-linux-android19-clang - custom-compiler: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/i686-linux-android19-clang - custom-archiver: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar - features: "jni,radix-engine" + # - crate: native-json-interface + # target-triple: aarch64-linux-android + # custom-linker: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android21-clang + # custom-compiler: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android21-clang + # custom-archiver: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar + # features: "jni,radix-engine" + # - crate: native-json-interface + # target-triple: armv7-linux-androideabi + # custom-linker: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/armv7a-linux-androideabi19-clang + # custom-compiler: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/armv7a-linux-androideabi19-clang + # custom-archiver: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar + # features: "jni,radix-engine" + # - crate: native-json-interface + # target-triple: i686-linux-android + # custom-linker: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/i686-linux-android19-clang + # custom-compiler: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/i686-linux-android19-clang + # custom-archiver: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar + # features: "jni,radix-engine" steps: - uses: FranzDiebold/github-env-vars-action@v2 @@ -148,9 +148,12 @@ jobs: if [ -z "${{ matrix.build-target.features }}" ]; then + echo "No special feature handling" export features="" else export features="--no-default-features --features ${{ matrix.build-target.features }}" + echo "Special feature handling" + echo $features fi cargo +nightly build \ From fa28bb7214a00f124abba57a5a4a8cd537ab7c85 Mon Sep 17 00:00:00 2001 From: Omar Date: Wed, 22 Mar 2023 22:12:51 +0300 Subject: [PATCH 7/7] disable default features --- .github/workflows/build.yml | 147 ++++++++++++++++++------------------ 1 file changed, 74 insertions(+), 73 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 15105e0f..f500cca6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,84 +20,84 @@ jobs: matrix: build-target: # native-json-interface Crate - # - crate: native-json-interface - # target-triple: aarch64-apple-darwin - # custom-linker: "" - # custom-compiler: /usr/local/opt/llvm/bin/clang - # custom-archiver: /usr/local/opt/llvm/bin/llvm-ar - # features: "jni,radix-engine" - # - crate: native-json-interface - # target-triple: x86_64-apple-ios - # custom-linker: "" - # custom-compiler: /usr/local/opt/llvm/bin/clang - # custom-archiver: /usr/local/opt/llvm/bin/llvm-ar - # features: "jni,radix-engine" - # - crate: native-json-interface - # target-triple: x86_64-apple-darwin - # custom-linker: "" - # custom-compiler: /usr/local/opt/llvm/bin/clang - # custom-archiver: /usr/local/opt/llvm/bin/llvm-ar - # features: "jni,radix-engine" - # - crate: native-json-interface - # target-triple: aarch64-apple-ios - # custom-linker: "" - # custom-compiler: /usr/local/opt/llvm/bin/clang - # custom-archiver: /usr/local/opt/llvm/bin/llvm-ar - # features: "jni,radix-engine" - # - crate: native-json-interface - # target-triple: aarch64-apple-ios-sim - # custom-linker: "" - # custom-compiler: /usr/local/opt/llvm/bin/clang - # custom-archiver: /usr/local/opt/llvm/bin/llvm-ar - # features: "jni,radix-engine" - # - crate: native-json-interface - # target-triple: x86_64-pc-windows-gnu - # custom-linker: "" - # custom-compiler: x86_64-w64-mingw32-gcc - # custom-archiver: x86_64-w64-mingw32-ar - # features: "jni,radix-engine" - # - crate: native-json-interface - # target-triple: x86_64-unknown-linux-gnu - # custom-linker: x86_64-unknown-linux-gnu-gcc - # custom-compiler: /usr/local/opt/llvm/bin/clang - # custom-archiver: /usr/local/opt/llvm/bin/llvm-ar - # features: "jni,radix-engine" - # - crate: native-json-interface - # target-triple: aarch64-unknown-linux-gnu - # custom-linker: aarch64-unknown-linux-gnu-gcc - # custom-compiler: aarch64-unknown-linux-gnu-gcc - # custom-archiver: aarch64-unknown-linux-gnu-gcc-ar - # features: "jni,radix-engine" - # - crate: native-json-interface - # target-triple: i686-unknown-linux-gnu - # custom-linker: i686-unknown-linux-gnu-gcc - # custom-compiler: i686-unknown-linux-gnu-gcc - # custom-archiver: i686-unknown-linux-gnu-gcc-ar - # features: "jni,radix-engine" + - crate: native-json-interface + target-triple: aarch64-apple-darwin + custom-linker: "" + custom-compiler: /usr/local/opt/llvm/bin/clang + custom-archiver: /usr/local/opt/llvm/bin/llvm-ar + features: "jni,radix-engine" + - crate: native-json-interface + target-triple: x86_64-apple-ios + custom-linker: "" + custom-compiler: /usr/local/opt/llvm/bin/clang + custom-archiver: /usr/local/opt/llvm/bin/llvm-ar + features: "jni,radix-engine" + - crate: native-json-interface + target-triple: x86_64-apple-darwin + custom-linker: "" + custom-compiler: /usr/local/opt/llvm/bin/clang + custom-archiver: /usr/local/opt/llvm/bin/llvm-ar + features: "jni,radix-engine" + - crate: native-json-interface + target-triple: aarch64-apple-ios + custom-linker: "" + custom-compiler: /usr/local/opt/llvm/bin/clang + custom-archiver: /usr/local/opt/llvm/bin/llvm-ar + features: "jni,radix-engine" + - crate: native-json-interface + target-triple: aarch64-apple-ios-sim + custom-linker: "" + custom-compiler: /usr/local/opt/llvm/bin/clang + custom-archiver: /usr/local/opt/llvm/bin/llvm-ar + features: "jni,radix-engine" + - crate: native-json-interface + target-triple: x86_64-pc-windows-gnu + custom-linker: "" + custom-compiler: x86_64-w64-mingw32-gcc + custom-archiver: x86_64-w64-mingw32-ar + features: "jni,radix-engine" + - crate: native-json-interface + target-triple: x86_64-unknown-linux-gnu + custom-linker: x86_64-unknown-linux-gnu-gcc + custom-compiler: /usr/local/opt/llvm/bin/clang + custom-archiver: /usr/local/opt/llvm/bin/llvm-ar + features: "jni,radix-engine" + - crate: native-json-interface + target-triple: aarch64-unknown-linux-gnu + custom-linker: aarch64-unknown-linux-gnu-gcc + custom-compiler: aarch64-unknown-linux-gnu-gcc + custom-archiver: aarch64-unknown-linux-gnu-gcc-ar + features: "jni,radix-engine" + - crate: native-json-interface + target-triple: i686-unknown-linux-gnu + custom-linker: i686-unknown-linux-gnu-gcc + custom-compiler: i686-unknown-linux-gnu-gcc + custom-archiver: i686-unknown-linux-gnu-gcc-ar + features: "jni,radix-engine" - crate: native-json-interface target-triple: wasm32-unknown-unknown custom-linker: "" custom-compiler: /usr/local/opt/llvm/bin/clang custom-archiver: /usr/local/opt/llvm/bin/llvm-ar features: "" - # - crate: native-json-interface - # target-triple: aarch64-linux-android - # custom-linker: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android21-clang - # custom-compiler: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android21-clang - # custom-archiver: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar - # features: "jni,radix-engine" - # - crate: native-json-interface - # target-triple: armv7-linux-androideabi - # custom-linker: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/armv7a-linux-androideabi19-clang - # custom-compiler: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/armv7a-linux-androideabi19-clang - # custom-archiver: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar - # features: "jni,radix-engine" - # - crate: native-json-interface - # target-triple: i686-linux-android - # custom-linker: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/i686-linux-android19-clang - # custom-compiler: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/i686-linux-android19-clang - # custom-archiver: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar - # features: "jni,radix-engine" + - crate: native-json-interface + target-triple: aarch64-linux-android + custom-linker: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android21-clang + custom-compiler: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android21-clang + custom-archiver: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar + features: "jni,radix-engine" + - crate: native-json-interface + target-triple: armv7-linux-androideabi + custom-linker: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/armv7a-linux-androideabi19-clang + custom-compiler: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/armv7a-linux-androideabi19-clang + custom-archiver: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar + features: "jni,radix-engine" + - crate: native-json-interface + target-triple: i686-linux-android + custom-linker: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/i686-linux-android19-clang + custom-compiler: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/i686-linux-android19-clang + custom-archiver: /usr/local/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ar + features: "jni,radix-engine" steps: - uses: FranzDiebold/github-env-vars-action@v2 @@ -151,7 +151,7 @@ jobs: echo "No special feature handling" export features="" else - export features="--no-default-features --features ${{ matrix.build-target.features }}" + export features="--features ${{ matrix.build-target.features }}" echo "Special feature handling" echo $features fi @@ -160,6 +160,7 @@ jobs: -Z build-std=std,panic_abort \ -Z build-std-features=panic_immediate_abort \ --target ${{ matrix.build-target.target-triple }} \ + --no-default-features \ --release $features unset $LINKER_ENVIRONMENT_VARIABLE