From 5e2eb96e7645fdd07b37b79d0e48046dcdcb06a4 Mon Sep 17 00:00:00 2001
From: enitu <edi.nitu2000@yahoo.com>
Date: Wed, 16 Apr 2025 11:01:15 +0200
Subject: [PATCH 1/5] fix: on push workflow

---
 .github/workflows/docker.yml | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index d719709..6e67ad3 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -38,16 +38,25 @@ jobs:
         run: |
           pip install uv
 
-      - name: Install invenio-override
+      - name: Install invenio-override from input
+        if: "${{ github.event.inputs.invenio-override-branch != '' }}"
         run: |
           mkdir .venv
           uv venv .venv
           source .venv/bin/activate
-          install_cmd='uv pip install git+https://github.com/sharedRDM/invenio-override@'
-          install_cmd_with_branch='${install_cmd}${{ github.event.inputs.invenio-override-branch }}'
-          eval "$install_cmd_with_branch"
+          install_cmd='uv pip install git+https://github.com/sharedRDM/invenio-override@${{ github.event.inputs.invenio-override-branch }}'
+          eval "$install_cmd"
 
+      - name: Install invenio-override from event
+        if: "${{ github.event.inputs.invenio-override-branch == '' }}"
+        run: |
+          mkdir .venv
+          uv venv .venv
+          source .venv/bin/activate
+          uv pip install git+https://github.com/sharedRDM/invenio-override@main
+    
       - name: Change pyproject.toml
+        if: "${{ github.event.inputs.invenio-override-branch != '' }}"
         run: sed -i 's/invenio-override", branch = "main"/invenio-override", branch = "${{ github.event.inputs.invenio-override-branch }}"/g' pyproject.toml
 
       - name: Relock uv

From 6550cf957285d64758ec4003599183ea79988011 Mon Sep 17 00:00:00 2001
From: enitu <edi.nitu2000@yahoo.com>
Date: Wed, 16 Apr 2025 11:20:03 +0200
Subject: [PATCH 2/5] test: on push workflow

---
 .github/workflows/docker.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 6e67ad3..8a8f3cb 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -8,6 +8,7 @@ on:
   push:
     branches:
       - main
+      - fix-workflow
     tags:
       - 'v*'
   workflow_dispatch:

From 96df41849acc4d05fc338c308aa155fc2315c7d0 Mon Sep 17 00:00:00 2001
From: enitu <edi.nitu2000@yahoo.com>
Date: Wed, 16 Apr 2025 11:32:07 +0200
Subject: [PATCH 3/5] Revert "test: on push workflow"

This reverts commit 6550cf957285d64758ec4003599183ea79988011.
---
 .github/workflows/docker.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 8a8f3cb..6e67ad3 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -8,7 +8,6 @@ on:
   push:
     branches:
       - main
-      - fix-workflow
     tags:
       - 'v*'
   workflow_dispatch:

From 7c812306569507b78c6e37ff8b8d3fcc92837e3c Mon Sep 17 00:00:00 2001
From: enitu <edi.nitu2000@yahoo.com>
Date: Wed, 16 Apr 2025 13:16:39 +0200
Subject: [PATCH 4/5] no duplicate

---
 .github/workflows/docker.yml | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 6e67ad3..de29793 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -8,6 +8,7 @@ on:
   push:
     branches:
       - main
+      - fix-workflow
     tags:
       - 'v*'
   workflow_dispatch:
@@ -38,22 +39,20 @@ jobs:
         run: |
           pip install uv
 
-      - name: Install invenio-override from input
-        if: "${{ github.event.inputs.invenio-override-branch != '' }}"
+      - name: Install invenio-override
         run: |
           mkdir .venv
           uv venv .venv
           source .venv/bin/activate
-          install_cmd='uv pip install git+https://github.com/sharedRDM/invenio-override@${{ github.event.inputs.invenio-override-branch }}'
-          eval "$install_cmd"
 
-      - name: Install invenio-override from event
-        if: "${{ github.event.inputs.invenio-override-branch == '' }}"
-        run: |
-          mkdir .venv
-          uv venv .venv
-          source .venv/bin/activate
-          uv pip install git+https://github.com/sharedRDM/invenio-override@main
+          if [[ '${{ github.event.inputs.invenio-override-branch }}' == '' ]]; then
+            INVENIO_OVERRIDE_BRANCH="main"
+          else
+            INVENIO_OVERRIDE_BRANCH="${{ github.event.inputs.invenio-override-branch }}"
+          fi
+          
+          install_cmd='uv pip install git+https://github.com/sharedRDM/invenio-override@${INVENIO_OVERRIDE_BRANCH}'
+          eval "$install_cmd"
     
       - name: Change pyproject.toml
         if: "${{ github.event.inputs.invenio-override-branch != '' }}"

From e4f1bc557ed5d2a4a535b093f2cb3a1262553d50 Mon Sep 17 00:00:00 2001
From: enitu <edi.nitu2000@yahoo.com>
Date: Wed, 16 Apr 2025 13:24:28 +0200
Subject: [PATCH 5/5] revert on push testing

---
 .github/workflows/docker.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index de29793..a990ded 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -8,7 +8,6 @@ on:
   push:
     branches:
       - main
-      - fix-workflow
     tags:
       - 'v*'
   workflow_dispatch:
@@ -50,7 +49,7 @@ jobs:
           else
             INVENIO_OVERRIDE_BRANCH="${{ github.event.inputs.invenio-override-branch }}"
           fi
-          
+
           install_cmd='uv pip install git+https://github.com/sharedRDM/invenio-override@${INVENIO_OVERRIDE_BRANCH}'
           eval "$install_cmd"