From 347913f6698ac1864ce0817a1e629898eb2a8b8a Mon Sep 17 00:00:00 2001
From: paulzierep <paul.zierep@googlemail.com>
Date: Fri, 8 Dec 2023 08:48:42 +0100
Subject: [PATCH] test git merge

---
 .github/workflows/run_tests.yaml | 44 +++++++++++++++++---------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/run_tests.yaml b/.github/workflows/run_tests.yaml
index 4e7f8644..a36552bc 100644
--- a/.github/workflows/run_tests.yaml
+++ b/.github/workflows/run_tests.yaml
@@ -21,7 +21,7 @@ jobs:
       matrix:
         python-version: [3.8]
         subset:
-         - repositories01.list
+         - repositories02.list
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -38,25 +38,27 @@ jobs:
         run: |
           git config user.name github-actions
           git config user.email github-actions@github.com
-          git diff --quiet || (git add results && git commit -m "fetch all tools bot  - step fetch") 
+          git add results
+          git diff --quiet || (git commit -m "fetch all tools bot  - step fetch") 
+          git pull -s recursive -X ours
           git push
 
-  fetch-all-tools-merge:
-    runs-on: ubuntu-20.04
-    needs: fetch-all-tools-stepwise
-    name: Fetch all tools merge
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
-      - name: Install requirement
-        run: python -m pip install -r requirements.txt
-      - name: Run script
-        run: | 
-          cat results/repositories*.list_tools.tsv > results/all_tools.tsv
-          bash ./bin/extract_all_tools_downstream.sh
-      - name: Commit all tools
-        run: |
-          git config user.name github-actions
-          git config user.email github-actions@github.com
-          git diff --quiet || (git add results && git commit -m "fetch all tools bot  - step merge") 
-          git push
\ No newline at end of file
+  # fetch-all-tools-merge:
+  #   runs-on: ubuntu-20.04
+  #   needs: fetch-all-tools-stepwise
+  #   name: Fetch all tools merge
+  #   steps:
+  #     - uses: actions/checkout@v3
+  #     - uses: actions/setup-python@v4
+  #     - name: Install requirement
+  #       run: python -m pip install -r requirements.txt
+  #     - name: Run script
+  #       run: | 
+  #         cat results/repositories*.list_tools.tsv > results/all_tools.tsv
+  #         bash ./bin/extract_all_tools_downstream.sh
+  #     - name: Commit all tools
+  #       run: |
+  #         git config user.name github-actions
+  #         git config user.email github-actions@github.com
+  #         git diff --quiet || (git add results && git commit -m "fetch all tools bot  - step merge") 
+  #         git push
\ No newline at end of file