From a02bb5981f355195ba04aee97c429c1a21c903c6 Mon Sep 17 00:00:00 2001
From: fdamato <83837719+fdamato@users.noreply.github.com>
Date: Tue, 18 Jul 2023 11:05:31 -0700
Subject: [PATCH] Enable RTL Repo Sync workflow. Disable Auto-merge to main
 (#500)

Co-authored-by: jlmahowa-amd <102375203+jlmahowa-amd@users.noreply.github.com>
---
 .github/workflows/nightly-release.yml |  7 ++---
 .github/workflows/rtl-repo-sync.yml   | 43 ++++++++++++++-------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml
index 79da1b2d40..d53fd18113 100644
--- a/.github/workflows/nightly-release.yml
+++ b/.github/workflows/nightly-release.yml
@@ -9,10 +9,9 @@ permissions:
   contents: write
 
 jobs:
-  # Disable RTL-Repo-Sync until manual fixes to work with the latest RTL are not made
-  #rtl-repo-sync:
-  #  name: RTL Repo Sync
-  #  uses: ./.github/workflows/rtl-repo-sync.yml
+  rtl-repo-sync:
+    name: RTL Repo Sync
+    uses: ./.github/workflows/rtl-repo-sync.yml
 
   find-latest-release:
     name: Find Latest Release
diff --git a/.github/workflows/rtl-repo-sync.yml b/.github/workflows/rtl-repo-sync.yml
index 51d8541129..8453ea1d37 100644
--- a/.github/workflows/rtl-repo-sync.yml
+++ b/.github/workflows/rtl-repo-sync.yml
@@ -65,26 +65,27 @@ jobs:
     needs: update-rtl
     if: needs.update-rtl.outputs.ci_checks_needed
 
-  merge-rtl-update:
-    name: Merge RTL Update
-    needs: [update-rtl, build-test, build-test-verilator]
-    if: needs.update-rtl.outputs.ci_checks_needed
-    runs-on: ubuntu-22.04
+  # Auto-Merging of RTL Update needs (without manual intervention) has to be re-discussed with Caliptra TAC members
+  #merge-rtl-update:
+    #name: Merge RTL Update
+    #needs: [update-rtl, build-test, build-test-verilator]
+    #if: needs.update-rtl.outputs.ci_checks_needed
+    #runs-on: ubuntu-22.04
 
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: 'true'
-          ref: 'main'
-          fetch-depth: 0
+    #steps:
+    #  - uses: actions/checkout@v3
+    #    with:
+    #      submodules: 'true'
+    #      ref: 'main'
+    #      fetch-depth: 0
 
-      - name: Merge RTL changes to main branch
-        run: |
-          git config --global user.name "GitHub CI"
-          git config --global user.email "username@users.noreply.github.com"
-          if [[ "${{ needs.update-rtl.outputs.branch_base_ref }}" != $(git rev-parse HEAD) ]]; then
-              echo "Commit added to main after CI RTL branch test started; cannot auto-merge branch"
-              exit 1
-          fi
-          git push origin ${{ needs.update-rtl.outputs.branch_name }} main
-          git push origin --delete ${{ needs.update-rtl.outputs.branch_name }}
+    #  - name: Merge RTL changes to main branch
+    #    run: |
+    #      git config --global user.name "GitHub CI"
+    #      git config --global user.email "username@users.noreply.github.com"
+    #      if [[ "${{ needs.update-rtl.outputs.branch_base_ref }}" != $(git rev-parse HEAD) ]]; then
+    #          echo "Commit added to main after CI RTL branch test started; cannot auto-merge branch"
+    #          exit 1
+    #      fi
+    #      git push origin ${{ needs.update-rtl.outputs.branch_name }} main
+    #      git push origin --delete ${{ needs.update-rtl.outputs.branch_name }}