Skip to content

Commit

Permalink
fix: remove noirc_driver/aztec feature flag in docker (#3784)
Browse files Browse the repository at this point in the history
# Description

This was not caught because the docker tests are not required checks and
it was only being ran on master.

They are not required because they need to be optimized a bit more with
caching. I don't expect them to fail often, so in the interim, its okay
to not have these as required (If this happens again and we have not
migrated, then we can revisit)

## Problem\*

Resolves <!-- Link to GitHub Issue -->

## Summary\*



## Additional Context



## Documentation\*

Check one:
- [ ] No documentation needed.
- [ ] Documentation included in this PR.
- [ ] **[Exceptional Case]** Documentation to be submitted in a separate
PR.

# PR Checklist\*

- [ ] I have tested the changes locally.
- [ ] I have formatted the changes with [Prettier](https://prettier.io/)
and/or `cargo fmt` on default settings.
  • Loading branch information
kevaundray committed Dec 12, 2023
1 parent 2717f6f commit a48d562
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 8 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/test-cargo.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
name: Test cargo

on:
pull_request:
merge_group:
push:
branches:
- 'master'
- master

# This will cancel previous runs when a branch or PR is updated
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.ref || github.run_id }}
cancel-in-progress: true

jobs:
build:
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/test-js.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
name: Test JS packages

on:
pull_request:
merge_group:
push:
branches:
- 'master'
- master

# This will cancel previous runs when a branch or PR is updated
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.ref || github.run_id }}
cancel-in-progress: true


jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion scripts/bootstrap_native.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ else
fi

# Build native.
cargo build --features="noirc_driver/aztec" --release
cargo build --release
2 changes: 0 additions & 2 deletions scripts/bootstrap_packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ else
export GIT_COMMIT=$(git rev-parse --verify HEAD)
fi

export cargoExtraArgs="--features noirc_driver/aztec"

yarn
yarn build

Expand Down
4 changes: 1 addition & 3 deletions scripts/test_js_packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ else
export GIT_COMMIT=$(git rev-parse --verify HEAD)
fi

export cargoExtraArgs="--features noirc_driver/aztec"

cargo build --features="noirc_driver/aztec" --release
cargo build --release
export PATH="${PATH}:/usr/src/noir/target/release/"

yarn
Expand Down

0 comments on commit a48d562

Please sign in to comment.