Skip to content

Commit

Permalink
Merge branch 'master' into tf/remove-unnecessary-truncation
Browse files Browse the repository at this point in the history
  • Loading branch information
kevaundray authored Dec 9, 2023
2 parents 5e8e567 + 3cf1f92 commit 5d8c293
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 13 deletions.
16 changes: 13 additions & 3 deletions .github/workflows/test-js-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -418,11 +418,13 @@ jobs:
run: |
yarn test:integration
# This is a noop job which depends on all test jobs
# This is a job which depends on all test jobs and reports the overall status.
# This allows us to add/remove test jobs without having to update the required workflows.
tests-end:
name: End
runs-on: ubuntu-latest
# We want this job to always run (even if the dependant jobs fail) as we want this job to fail rather than skipping.
if: ${{ always() }}
needs:
- test-acvm_js-node
- test-acvm_js-browser
Expand All @@ -435,5 +437,13 @@ jobs:
- test-integration

steps:
- name: Noop
run: echo "noop"
- name: Report overall success
run: |
if [[ $FAIL == true ]]; then
exit 1
else
exit 0
fi
env:
# We treat any skipped or failing jobs as a failure for the workflow as a whole.
FAIL: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') }}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ This crate's minimum supported rustc version is 1.71.1.

## Working on this project

This project uses [Nix](https://nixos.org/) and [direnv](https://direnv.net/) to streamline the development experience. Please follow [our guidelines](https://noir-lang.org/getting_started/nargo_installation/#option-4-compile-from-source) to setup your environment for working on the project.
This project uses [Nix](https://nixos.org/) and [direnv](https://direnv.net/) to streamline the development experience. Please follow [our guidelines](https://noir-lang.org/getting_started/nargo_installation/#option-3-compile-from-source) to setup your environment for working on the project.

### Building against a different local/remote version of Barretenberg

Expand Down
9 changes: 6 additions & 3 deletions compiler/noirc_frontend/src/lexer/lexer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -633,15 +633,18 @@ mod tests {
}

#[test]
fn test_attribute_with_apostrophe() {
let input = r#"#[test(should_fail_with = "the eagle's feathers")]"#;
fn test_attribute_with_common_punctuation() {
let input =
r#"#[test(should_fail_with = "stmt. q? exclaim! & symbols, 1% shouldn't fail")]"#;
let mut lexer = Lexer::new(input);

let token = lexer.next_token().unwrap().token().clone();
assert_eq!(
token,
Token::Attribute(Attribute::Function(FunctionAttribute::Test(
TestScope::ShouldFailWith { reason: "the eagle's feathers".to_owned().into() }
TestScope::ShouldFailWith {
reason: "stmt. q? exclaim! & symbols, 1% shouldn't fail".to_owned().into()
}
)))
);
}
Expand Down
7 changes: 1 addition & 6 deletions compiler/noirc_frontend/src/lexer/token.rs
Original file line number Diff line number Diff line change
Expand Up @@ -468,13 +468,8 @@ impl Attribute {
.all(|ch| {
ch.is_ascii_alphabetic()
|| ch.is_numeric()
|| ch == '_'
|| ch == '('
|| ch == ')'
|| ch == '='
|| ch == '"'
|| ch.is_ascii_punctuation()
|| ch == ' '
|| ch == '\''
})
.then_some(());

Expand Down

0 comments on commit 5d8c293

Please sign in to comment.