From a4299836957b39c2558792de1464260540316002 Mon Sep 17 00:00:00 2001
From: Illia Vysochyn <ivysochyn@antmicro.com>
Date: Fri, 9 Aug 2024 13:10:50 +0200
Subject: [PATCH 1/2] scripts: build_local_target.sh: Refactor local flow

Refactors script to the updated Local flow

Signed-off-by: Illia Vysochyn <ivysochyn@antmicro.com>
---
 .github/scripts/build_local_target.sh | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/scripts/build_local_target.sh b/.github/scripts/build_local_target.sh
index 44ee974..ea6520f 100755
--- a/.github/scripts/build_local_target.sh
+++ b/.github/scripts/build_local_target.sh
@@ -13,15 +13,23 @@ echo "Build ${target_name} macro"
 for stage in "${STAGES[@]}"
 do
   if [[ -z $SKIP_BUILD ]] ; then
-    echo "query dependency target"
+    echo "[${target_name}] ${stage}: Query dependency target"
     bazel query "${target_name}_${stage}_deps"
     bazel query "${target_name}_${stage}_deps" --output=build
-    echo "build dependency"
+    echo "[${target_name}] ${stage}: Build dependency"
     bazel run --subcommands --verbose_failures --sandbox_debug "${target_name}_${stage}_deps" -- "$(pwd)/build"
   fi
   if [[ -z $SKIP_RUN ]] ; then
-    echo "run make script"
-    build/make "${stage}"
+    stages=()
+    if [[ $stage == "synth" ]]; then
+        stages+=("do-yosys-canonicalize" "do-yosys")
+    fi
+    stages+=("do-${stage}")
+    for local_stage in "${stages[@]}"
+    do
+        echo "[${target_name}] ${local_stage}: Run make script"
+        build/make "${local_stage}"
+    done
   fi
 done
 

From 576a88fc2e6e33b3b981f3eb5f09af30d8d8ddf7 Mon Sep 17 00:00:00 2001
From: Illia Vysochyn <ivysochyn@antmicro.com>
Date: Fri, 9 Aug 2024 13:20:33 +0200
Subject: [PATCH 2/2] CI: Update local flow Docker image revision

Signed-off-by: Illia Vysochyn <ivysochyn@antmicro.com>
---
 .github/workflows/ci.yml | 4 ++--
 MODULE.bazel             | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bf05608..13f007d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -73,7 +73,8 @@ jobs:
     name: Local flow - test targets
     runs-on: ubuntu-22.04
     container:
-      image: openroad/orfs:v3.0-1022-g69767b6a@sha256:adc74e5343a7638919f747eb74cbc67b5b71b18d9012608fef912ccee534c458
+      # NOTE: Ensure this is kept in sync with MODULE.bazel
+      image: openroad/orfs:v3.0-1114-g46acc762@sha256:ae4df23391c26bcc48a506f8e0d0da73742d1b6cb3b1dc02f4d5ea71170195b5
     defaults:
       run:
         shell: bash
@@ -149,7 +150,6 @@ jobs:
           STAGES: synth floorplan place
         run: .github/scripts/build_local_target.sh
       - name: Open target
-        if: matrix.STAGE_TARGET == 'L1MetadataArray_generate_abstract'
         run: |
           for stage in "floorplan" "place"; do
             echo | build/make open_${stage}
diff --git a/MODULE.bazel b/MODULE.bazel
index 2156408..19f6b65 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -23,6 +23,7 @@ git_override(
 #)
 
 orfs = use_extension("@bazel-orfs//:extension.bzl", "orfs_repositories")
+# NOTE: Ensure this is kept in sync with CI
 orfs.default(
     image = "openroad/orfs:v3.0-1114-g46acc762",
     sha256 = "ae4df23391c26bcc48a506f8e0d0da73742d1b6cb3b1dc02f4d5ea71170195b5",