Skip to content

Commit

Permalink
Adds Glean back in the iOS megazord to enable Glean-Rust for Nimbus
Browse files Browse the repository at this point in the history
Conditionally compile Nimbus with glean-rlb only on iOS

Addressing a tricky merge while keeping this up to date with main

Fixing some merge issues

Update dependencies and satisfy lints

Remove duplicate use statement
  • Loading branch information
travis79 committed Sep 20, 2022
1 parent 3e570ba commit b9d4a88
Show file tree
Hide file tree
Showing 31 changed files with 1,071 additions and 496 deletions.
1 change: 1 addition & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ commands:
- run: sudo apt-get update
- run: sudo apt-get install python tcl
- run: sudo apt-get install python3-venv
- run: sudo apt-get install python3-pip
- run:
name: Install NSS build system dependencies
command: sudo apt-get install ninja-build gyp zlib1g-dev
Expand Down
Loading

0 comments on commit b9d4a88

Please sign in to comment.