From 3b489d3478025809c64005ceca5942be219086df Mon Sep 17 00:00:00 2001
From: Anca Lita <27920906+ancalita@users.noreply.github.com>
Date: Sat, 7 Oct 2023 10:40:57 +0100
Subject: [PATCH 01/10] poetry self add setuptools

---
 .github/workflows/continous-integration.yml | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/continous-integration.yml b/.github/workflows/continous-integration.yml
index a2c7d764850a..ea3d194566a3 100644
--- a/.github/workflows/continous-integration.yml
+++ b/.github/workflows/continous-integration.yml
@@ -136,6 +136,11 @@ jobs:
         with:
           poetry-version: ${{ env.POETRY_VERSION }}
 
+      - name: Inject setuptools into poetry's runtime environment
+        if: needs.changes.outputs.backend == 'true'
+        run: |
+          poetry self add setuptools
+
       - name: Load Poetry Cached Libraries ⬇
         id: cache-poetry
         if: needs.changes.outputs.backend == 'true'
@@ -163,7 +168,7 @@ jobs:
         # This is a workaround for that issue
         run: |
           sudo apt-get -y install libpq-dev
-          make install-full || make install-full || make install-full
+          make install-full
 
       - name: Checkout target branch to be able to diff
         if: needs.changes.outputs.backend == 'true' && github.event_name == 'pull_request'
@@ -277,6 +282,11 @@ jobs:
         with:
           poetry-version: ${{ env.POETRY_VERSION }}
 
+      - name: Inject setuptools into poetry's runtime environment
+        if: needs.changes.outputs.backend == 'true'
+        run: |
+          poetry self add setuptools
+
       - name: Load Poetry Cached Libraries ⬇
         id: cache-poetry
         if: needs.changes.outputs.backend == 'true'
@@ -311,7 +321,7 @@ jobs:
         # This is a workaround for that issue
         run: |
           sudo apt-get -y install libpq-dev
-          make install-full | tee .output  || make install-full | tee .output || make install-full | tee .output
+          make install-full | tee .output
           if grep 'The lock file is not up to date' .output; then exit 1; fi
           make prepare-tests-ubuntu
 
@@ -330,7 +340,7 @@ jobs:
             Remove-Item -Force -Recurse $spacy_data_dir
             New-Item -Path $spacy_data_dir -Type Directory
           }
-          make install-full  || make install-full || make install-full
+          make install-full
           make prepare-tests-windows-gha
 
       - name: Add github workflow problem matchers
@@ -427,6 +437,11 @@ jobs:
         with:
           poetry-version: ${{ env.POETRY_VERSION }}
 
+      - name: Inject setuptools into poetry's runtime environment
+        if: needs.changes.outputs.backend == 'true'
+        run: |
+          poetry self add setuptools
+
       - name: Load Poetry Cached Libraries ⬇
         id: cache-poetry
         if: needs.changes.outputs.backend == 'true'

From aa371feb677e34b42bb9d62f6e03f2393e06f616 Mon Sep 17 00:00:00 2001
From: Anca Lita <27920906+ancalita@users.noreply.github.com>
Date: Sat, 7 Oct 2023 11:19:31 +0100
Subject: [PATCH 02/10] Test 2: Trigger CI


From 6aef1ae6044612489a68bd2e54fb653a6a0d2200 Mon Sep 17 00:00:00 2001
From: Anca Lita <27920906+ancalita@users.noreply.github.com>
Date: Sat, 7 Oct 2023 12:42:42 +0100
Subject: [PATCH 03/10] Test 3: Trigger CI


From 1f7b0cc537953431100ab94f903efa3f739d910b Mon Sep 17 00:00:00 2001
From: Anca Lita <27920906+ancalita@users.noreply.github.com>
Date: Sat, 7 Oct 2023 13:05:20 +0100
Subject: [PATCH 04/10] Test 4: Trigger CI


From 414eb6a17aeae47d3049852c7683f44b16e605a8 Mon Sep 17 00:00:00 2001
From: Anca Lita <27920906+ancalita@users.noreply.github.com>
Date: Sat, 7 Oct 2023 16:18:35 +0100
Subject: [PATCH 05/10] Test 5: Trigger CI


From 0b20f43da01be5acaabd13aeecd5a7c26b03d769 Mon Sep 17 00:00:00 2001
From: Anca Lita <27920906+ancalita@users.noreply.github.com>
Date: Sat, 7 Oct 2023 16:52:40 +0100
Subject: [PATCH 06/10] Test 6: Trigger CI


From 54016dfd0ddc780bb3d022d90901bac077742993 Mon Sep 17 00:00:00 2001
From: Anca Lita <27920906+ancalita@users.noreply.github.com>
Date: Sat, 7 Oct 2023 17:15:17 +0100
Subject: [PATCH 07/10] Test 7: Trigger CI


From 95e44ff44ab995d6aea54713b21c1ad0cea27239 Mon Sep 17 00:00:00 2001
From: Anca Lita <27920906+ancalita@users.noreply.github.com>
Date: Sat, 7 Oct 2023 18:30:38 +0100
Subject: [PATCH 08/10] Test 8: Trigger CI


From 096e0d5743ec50e163f00cce7f1b52fd6430bd90 Mon Sep 17 00:00:00 2001
From: Anca Lita <27920906+ancalita@users.noreply.github.com>
Date: Sat, 7 Oct 2023 19:48:44 +0100
Subject: [PATCH 09/10] Test 9: Trigger CI


From e9bf8ecd98897fc5c659db4be04c0ede4e2065e4 Mon Sep 17 00:00:00 2001
From: Anca Lita <27920906+ancalita@users.noreply.github.com>
Date: Sat, 7 Oct 2023 20:19:03 +0100
Subject: [PATCH 10/10] Test 10: Trigger CI