disable default features

radixdlt · Mar 22, 2023 · fa28bb7 · fa28bb7
1 parent e973658
commit fa28bb7
Showing 1 changed file with 74 additions and 73 deletions.
diff --git 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