Skip to content

Commit

Permalink
Merge branch 'main' into B-21440-MAIN
Browse files Browse the repository at this point in the history
  • Loading branch information
CoryKleinjanCACI committed Feb 21, 2025
2 parents d2ebe23 + f130821 commit d2c4b50
Show file tree
Hide file tree
Showing 418 changed files with 32,174 additions and 5,702 deletions.
1 change: 1 addition & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -945,6 +945,7 @@ commands:
FEATURE_FLAG_UNACCOMPANIED_BAGGAGE: 'false'
FEATURE_FLAG_ENABLE_ALASKA: 'false'
FEATURE_FLAG_BULK_ASSIGNMENT: 'false'

command: |
SHARD=$((${CIRCLE_NODE_INDEX}+1))
PLAYWRIGHT_JUNIT_OUTPUT_NAME=playwright-results.xml \
Expand Down
2 changes: 1 addition & 1 deletion .envrc
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ if [ ! -r .nix-disable ] && has nix-env; then

# add the NIX_PROFILE bin path so that everything we just installed
# is available on the path
PATH_add ${NIX_PROFILE}/bin
PATH_add "${NIX_PROFILE}"/bin
# Add the node binaries to our path
PATH_add ./node_modules/.bin
# nix is immutable, so we need to specify a path for local changes, e.g.
Expand Down
Loading

0 comments on commit d2c4b50

Please sign in to comment.