From 3bd2b2ca8cfa4437741bc66d376defe4d580fbff Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Tue, 22 Aug 2023 18:47:19 +0000 Subject: [PATCH 1/3] feat(release): Allow releases to have additional feature flags --- .github/workflows/publish.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e8b80dfbb9d..4d8c3b9c42c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -7,6 +7,9 @@ on: tag: description: The tag to build Nargo from (leave empty to build a nightly release from master) required: false + features: + description: The feature flags to release with + required: false publish: description: Whether to publish the build artifacts type: boolean @@ -106,7 +109,7 @@ jobs: env: BARRETENBERG_BIN_DIR: ${{ github.workspace }}/libbarretenberg-wasm32/bin run: | - cargo build --package nargo_cli --release --target ${{ matrix.target }} --no-default-features --features plonk_bn254_wasm + cargo build --package nargo_cli --release --target ${{ matrix.target }} --no-default-features --features plonk_bn254_wasm ${{ inputs.features }} - uses: actions/cache/save@v3 # Don't create cache entries for the merge queue. @@ -198,7 +201,7 @@ jobs: BARRETENBERG_BIN_DIR: ${{ github.workspace }}/libbarretenberg-wasm32/bin run: | cargo install cross --force --git https://github.com/cross-rs/cross - cross build --package nargo_cli --release --target=${{ matrix.target }} --no-default-features --features plonk_bn254_wasm + cross build --package nargo_cli --release --target=${{ matrix.target }} --no-default-features --features plonk_bn254_wasm ${{ inputs.features }} - uses: actions/cache/save@v3 # Don't create cache entries for the merge queue. @@ -282,7 +285,7 @@ jobs: env: BARRETENBERG_BIN_DIR: ${{ github.workspace }}/libbarretenberg-wasm32/bin run: | - cargo build --package nargo_cli --release --target ${{ matrix.target }} --no-default-features --features plonk_bn254_wasm + cargo build --package nargo_cli --release --target ${{ matrix.target }} --no-default-features --features plonk_bn254_wasm ${{ inputs.features }} - uses: actions/cache/save@v3 # Don't create cache entries for the merge queue. From 354d56e9833cfd0054a0d320075383f45c670374 Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Thu, 24 Aug 2023 20:29:39 +0000 Subject: [PATCH 2/3] fix: update name to extra args --- .github/workflows/publish.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 4d8c3b9c42c..ead0f00ba23 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -7,8 +7,8 @@ on: tag: description: The tag to build Nargo from (leave empty to build a nightly release from master) required: false - features: - description: The feature flags to release with + extra-args: + description: Extra cargo cli arguments to release with required: false publish: description: Whether to publish the build artifacts @@ -109,7 +109,7 @@ jobs: env: BARRETENBERG_BIN_DIR: ${{ github.workspace }}/libbarretenberg-wasm32/bin run: | - cargo build --package nargo_cli --release --target ${{ matrix.target }} --no-default-features --features plonk_bn254_wasm ${{ inputs.features }} + cargo build --package nargo_cli --release --target ${{ matrix.target }} --no-default-features --features plonk_bn254_wasm ${{ inputs.extra-args }} - uses: actions/cache/save@v3 # Don't create cache entries for the merge queue. @@ -201,7 +201,7 @@ jobs: BARRETENBERG_BIN_DIR: ${{ github.workspace }}/libbarretenberg-wasm32/bin run: | cargo install cross --force --git https://github.com/cross-rs/cross - cross build --package nargo_cli --release --target=${{ matrix.target }} --no-default-features --features plonk_bn254_wasm ${{ inputs.features }} + cross build --package nargo_cli --release --target=${{ matrix.target }} --no-default-features --features plonk_bn254_wasm ${{ inputs.extra-args }} - uses: actions/cache/save@v3 # Don't create cache entries for the merge queue. @@ -285,7 +285,7 @@ jobs: env: BARRETENBERG_BIN_DIR: ${{ github.workspace }}/libbarretenberg-wasm32/bin run: | - cargo build --package nargo_cli --release --target ${{ matrix.target }} --no-default-features --features plonk_bn254_wasm ${{ inputs.features }} + cargo build --package nargo_cli --release --target ${{ matrix.target }} --no-default-features --features plonk_bn254_wasm ${{ inputs.extra-args }} - uses: actions/cache/save@v3 # Don't create cache entries for the merge queue. From f5ca546b9e4afae5a060745611fc4b24de3b1d04 Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Tue, 29 Aug 2023 10:50:37 +0000 Subject: [PATCH 3/3] fix: kevs recommendation --- .github/workflows/publish.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ea4a0d6a623..fd9638665e2 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -7,8 +7,8 @@ on: tag: description: The tag to build Nargo from (leave empty to build a nightly release from master) required: false - extra-args: - description: Extra cargo cli arguments to release with + features: + description: Extra feature flags to release with required: false publish: description: Whether to publish the build artifacts @@ -109,7 +109,7 @@ jobs: env: BARRETENBERG_BIN_DIR: ${{ github.workspace }}/libbarretenberg-wasm32/bin run: | - cargo build --package nargo_cli --release --target ${{ matrix.target }} --no-default-features --features plonk_bn254_wasm ${{ inputs.extra-args }} + cargo build --package nargo_cli --release --target ${{ matrix.target }} --no-default-features --features "plonk_bn254_wasm ${{ inputs.features }}" - uses: actions/cache/save@v3 # Don't create cache entries for the merge queue. @@ -201,7 +201,7 @@ jobs: BARRETENBERG_BIN_DIR: ${{ github.workspace }}/libbarretenberg-wasm32/bin run: | cargo install cross --version 0.2.5 --force - cross build --package nargo_cli --release --target=${{ matrix.target }} --no-default-features --features plonk_bn254_wasm ${{ inputs.extra-args }} + cross build --package nargo_cli --release --target=${{ matrix.target }} --no-default-features --features "plonk_bn254_wasm ${{ inputs.features }}" - uses: actions/cache/save@v3 # Don't create cache entries for the merge queue. @@ -285,7 +285,7 @@ jobs: env: BARRETENBERG_BIN_DIR: ${{ github.workspace }}/libbarretenberg-wasm32/bin run: | - cargo build --package nargo_cli --release --target ${{ matrix.target }} --no-default-features --features plonk_bn254_wasm ${{ inputs.extra-args }} + cargo build --package nargo_cli --release --target ${{ matrix.target }} --no-default-features --features "plonk_bn254_wasm ${{ inputs.features }}" - uses: actions/cache/save@v3 # Don't create cache entries for the merge queue.