From bdb350658c4435c6a96d438629444ced68357fe8 Mon Sep 17 00:00:00 2001
From: Ofir Bino <thebinoman@gmail.com>
Date: Fri, 1 Mar 2024 18:52:11 +0200
Subject: [PATCH] Reapplying Github workflow tests for merge_repos.sh stage.

---
 .github/workflows/pre-submit-fork-test.yaml | 22 ++++++++++-----------
 .github/workflows/pre-submit-pr-test.yaml   | 12 +++++------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/pre-submit-fork-test.yaml b/.github/workflows/pre-submit-fork-test.yaml
index ec650e6..679b4c7 100644
--- a/.github/workflows/pre-submit-fork-test.yaml
+++ b/.github/workflows/pre-submit-fork-test.yaml
@@ -35,16 +35,16 @@ jobs:
         run: |
           git checkout main
           bash test/sensitive_data.sh
-  # MergeRepos:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #       with:
-  #         fetch-depth: 0
-  #     - name: test merge repos question
-  #       run: |
-  #         git checkout main
-  #         cd test
-  #         bash merge_repos.sh
+  MergeRepos:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: test merge repos question
+        run: |
+          git checkout main
+          cd test
+          bash merge_repos.sh
           
           
diff --git a/.github/workflows/pre-submit-pr-test.yaml b/.github/workflows/pre-submit-pr-test.yaml
index 35f07b4..b7d739b 100644
--- a/.github/workflows/pre-submit-pr-test.yaml
+++ b/.github/workflows/pre-submit-pr-test.yaml
@@ -30,11 +30,11 @@ jobs:
           cd tmprepo
           git checkout main
           bash test/sensitive_data.sh
-      # - name: test merge repos question
-      #   run: |
-      #     cd tmprepo
-      #     git checkout main
-      #     cd test
-      #     bash merge_repos.sh
+      - name: test merge repos question
+        run: |
+          cd tmprepo
+          git checkout main
+          cd test
+          bash merge_repos.sh