From ac76cf778d36374c02c7b731f2ccb74f196522e8 Mon Sep 17 00:00:00 2001 From: seemenkina Date: Mon, 9 Sep 2024 17:45:58 +0700 Subject: [PATCH 1/2] fix(CI): add conditional to nightly build --- .github/workflows/nightly-release.yml | 12 ++++++++++-- rln-cli/Cargo.toml | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml index b2501627..7a71b798 100644 --- a/.github/workflows/nightly-release.yml +++ b/.github/workflows/nightly-release.yml @@ -30,7 +30,11 @@ jobs: run: make installdeps - name: cross build run: | - cross build --release --target ${{ matrix.target }} --features ${{ matrix.feature }} --workspace --exclude rln-wasm + if [ "${{ matrix.feature }}" == "stateless" ]; then + cross build --release --target ${{ matrix.target }} --features ${{ matrix.feature }} --workspace --exclude rln-wasm --exclude rln-cli + else + cross build --release --target ${{ matrix.target }} --features ${{ matrix.feature }} --workspace --exclude rln-wasm + fi mkdir release cp target/${{ matrix.target }}/release/librln* release/ tar -czvf ${{ matrix.target }}-${{ matrix.feature }}-rln.tar.gz release/ @@ -66,7 +70,11 @@ jobs: run: make installdeps - name: cross build run: | - cross build --release --target ${{ matrix.target }} --features ${{ matrix.feature }} --workspace --exclude rln-wasm + if [ "${{ matrix.feature }}" == "stateless" ]; then + cross build --release --target ${{ matrix.target }} --features ${{ matrix.feature }} --workspace --exclude rln-wasm --exclude rln-cli + else + cross build --release --target ${{ matrix.target }} --features ${{ matrix.feature }} --workspace --exclude rln-wasm + fi mkdir release cp target/${{ matrix.target }}/release/librln* release/ tar -czvf ${{ matrix.target }}-${{ matrix.feature }}-rln.tar.gz release/ diff --git a/rln-cli/Cargo.toml b/rln-cli/Cargo.toml index 9e710f4f..86f168ec 100644 --- a/rln-cli/Cargo.toml +++ b/rln-cli/Cargo.toml @@ -4,7 +4,7 @@ version = "0.3.0" edition = "2021" [dependencies] -rln = { path = "../rln" } +rln = { path = "../rln", default-features = true, features = ["arkzkey"] } clap = { version = "4.2.7", features = ["cargo", "derive", "env"]} clap_derive = { version = "=4.2.0" } color-eyre = "=0.6.2" From 1103a7347eca4c9ffae6d62f39099602729403d4 Mon Sep 17 00:00:00 2001 From: seemenkina Date: Mon, 9 Sep 2024 18:10:31 +0700 Subject: [PATCH 2/2] fix(CI): add include into matrix build --- .github/workflows/nightly-release.yml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml index 7a71b798..0400228a 100644 --- a/.github/workflows/nightly-release.yml +++ b/.github/workflows/nightly-release.yml @@ -13,6 +13,9 @@ jobs: - x86_64-unknown-linux-gnu - aarch64-unknown-linux-gnu - i686-unknown-linux-gnu + include: + - feature: stateless + cargo_args: --exclude rln-cli name: Linux build runs-on: ubuntu-latest steps: @@ -30,11 +33,7 @@ jobs: run: make installdeps - name: cross build run: | - if [ "${{ matrix.feature }}" == "stateless" ]; then - cross build --release --target ${{ matrix.target }} --features ${{ matrix.feature }} --workspace --exclude rln-wasm --exclude rln-cli - else - cross build --release --target ${{ matrix.target }} --features ${{ matrix.feature }} --workspace --exclude rln-wasm - fi + cross build --release --target ${{ matrix.target }} --features ${{ matrix.feature }} --workspace --exclude rln-wasm ${{ matrix.cargo_args }} mkdir release cp target/${{ matrix.target }}/release/librln* release/ tar -czvf ${{ matrix.target }}-${{ matrix.feature }}-rln.tar.gz release/ @@ -55,6 +54,9 @@ jobs: target: - x86_64-apple-darwin - aarch64-apple-darwin + include: + - feature: stateless + cargo_args: --exclude rln-cli steps: - name: Checkout sources uses: actions/checkout@v3 @@ -70,11 +72,7 @@ jobs: run: make installdeps - name: cross build run: | - if [ "${{ matrix.feature }}" == "stateless" ]; then - cross build --release --target ${{ matrix.target }} --features ${{ matrix.feature }} --workspace --exclude rln-wasm --exclude rln-cli - else - cross build --release --target ${{ matrix.target }} --features ${{ matrix.feature }} --workspace --exclude rln-wasm - fi + cross build --release --target ${{ matrix.target }} --features ${{ matrix.feature }} --workspace --exclude rln-wasm ${{ matrix.cargo_args }} mkdir release cp target/${{ matrix.target }}/release/librln* release/ tar -czvf ${{ matrix.target }}-${{ matrix.feature }}-rln.tar.gz release/