diff --git a/.circleci/config.yml b/.circleci/config.yml index 4fc68488e..b2a5f6d0d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -306,4 +306,8 @@ workflows: - just_simulate_sc_rehearsal_2 - just_simulate_sc_rehearsal_4 - just_simulate_ink_respected_game_type - - simulate_non_terminal_tasks \ No newline at end of file + # Simulate non-terminal tasks. + # This process finds all non-terminal tasks that currently + # exist in the task list and simulates them to ensure that + # they are still valid. + - simulate_non_terminal_tasks diff --git a/lib/base-contracts b/lib/base-contracts index ed36aac52..494586571 160000 --- a/lib/base-contracts +++ b/lib/base-contracts @@ -1 +1 @@ -Subproject commit ed36aac52a19bdad6dee09c59e7241fe3a194160 +Subproject commit 494586571e1a4d845ee6f381b65229d63c630986 diff --git a/lib/forge-std b/lib/forge-std index 2d8b7b876..b93cf4bc3 160000 --- a/lib/forge-std +++ b/lib/forge-std @@ -1 +1 @@ -Subproject commit 2d8b7b876a5b328d6a73e13c4740ed7a0d72d5f4 +Subproject commit b93cf4bc34ff214c099dc970b153f85ade8c9f66 diff --git a/lib/solady b/lib/solady index a6a95729f..513f58167 160000 --- a/lib/solady +++ b/lib/solady @@ -1 +1 @@ -Subproject commit a6a95729f947bb2a24e05e862ba9522c10453a70 +Subproject commit 513f581675374706dbe947284d6b12d19ce35a2a diff --git a/lib/superchain-registry b/lib/superchain-registry index ea7e768a0..c08331ab4 160000 --- a/lib/superchain-registry +++ b/lib/superchain-registry @@ -1 +1 @@ -Subproject commit ea7e768a02a6f88a38a1d39d27b9be6c212f4b6e +Subproject commit c08331ab44a3645608c08d8c94f78d9be46c13c9 diff --git a/script/utils/simulate-tasks.sh b/script/utils/simulate-tasks.sh index a229467ca..651ec6001 100755 --- a/script/utils/simulate-tasks.sh +++ b/script/utils/simulate-tasks.sh @@ -33,19 +33,23 @@ search_non_terminal_tasks() { done } -# Define directories to skip - you should add reasons why it's being skipped. -directories_to_skip=( - "tasks/sep/base-003-fp-granite-prestate" # investigating why this simulation breaks. - "tasks/sep/013-fp-granite-prestate" # investigating why this simulation breaks. -) +# Define directories to skip. If you're adding to this list, please add a comment explaining why. +directories_to_skip=() should_skip_directory() { local dir="$1" for skip_dir in "${directories_to_skip[@]}"; do if [[ "$dir" == *"$skip_dir"* ]]; then + echo "Skipping task: $(basename "$task") because it's been marked as a directory to skip." return 0 fi done + # Check if 'justfile' exists in the current directory. If it exists then it's either an old task + # or a template task that we can skip. + if [ -f "$dir/justfile" ]; then + echo "Skipping task: $(basename "$task") because it contains a 'justfile'." + return 0 + fi return 1 } @@ -63,11 +67,7 @@ else current_dir=$(pwd) cd "$task" || exit 1 - # Check if 'justfile' exists in the current directory it's either an old task - # that we can skip or a template task which we should also skip. - if [ -f "justfile" ] || should_skip_directory "$task"; then - echo "Skipping task: $(basename "$task") - please see simultate-tasks.sh for more information." - else + if ! should_skip_directory "$task"; then just --dotenv-path "$PWD/.env" --justfile "$ROOT_DIR/single.just" simulate 0 fi @@ -87,9 +87,7 @@ else current_dir=$(pwd) cd "$task" || exit 1 - if [ -f "justfile" ] || should_skip_directory "$task"; then - echo "Skipping task: $(basename "$task") - please see simultate-tasks.sh to see why." - else + if ! should_skip_directory "$task"; then just --dotenv-path "$PWD/.env" --justfile "$ROOT_DIR/nested.just" simulate council just --dotenv-path "$PWD/.env" --justfile "$ROOT_DIR/nested.just" approve council just --dotenv-path "$PWD/.env" --justfile "$ROOT_DIR/nested.just" simulate foundation