From 611f6343b653f5430685818bb7e173c3fab9a399 Mon Sep 17 00:00:00 2001
From: ilai <ilai@pinecone.io>
Date: Wed, 1 Nov 2023 12:04:24 +0200
Subject: [PATCH] [CI] Build in the main release job, download in test job

Makes more sense - this way we can control the version etc
---
 .github/workflows/pre-release-CI.yml | 34 +------------------
 .github/workflows/release.yml        | 49 +++++++++++++++++++++++-----
 2 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/pre-release-CI.yml b/.github/workflows/pre-release-CI.yml
index fd9e14c2..8a55dca0 100644
--- a/.github/workflows/pre-release-CI.yml
+++ b/.github/workflows/pre-release-CI.yml
@@ -9,40 +9,8 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
-    name: Build python${{ matrix.python-version }}
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [3.9, '3.10', 3.11]
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Install Poetry
-        uses: snok/install-poetry@v1
-        with:
-          version: 1.3.2
-
-      - name: Build wheel
-        run: |
-          poetry build
-
-      - name: Upload wheels
-        uses: actions/upload-artifact@v3
-        with:
-          name: wheels-py${{ matrix.python-version }}
-          path: ./dist/
-
-
-  build-and-test:
+  test-installation:
     name: Test on ${{ matrix.os }}-py${{ matrix.python-version }}
-    needs: build
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 62f34dc9..9b9403ff 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -31,17 +31,48 @@ env:
 
 jobs:
   build:
-    uses: ./.github/workflows/pre-release-CI.yml
-
-  publish:
-    needs: build
+    name: Build python${{ matrix.python-version }}
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [ 3.9, '3.10', 3.11 ]
+
     steps:
-      - name: download wheels
-        uses: actions/download-artifact@v2
+      - uses: actions/checkout@v3
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
         with:
-          path: wheels
+          version: 1.3.2
 
-      - name: debug print wheels
+      - name: Build wheel
         run: |
-          ls -lah wheels/
\ No newline at end of file
+          poetry build
+
+      - name: Upload wheels
+        uses: actions/upload-artifact@v3
+        with:
+          name: wheels-py${{ matrix.python-version }}
+          path: ./dist/
+
+  test-all-OSes:
+    needs: build
+    uses: ./.github/workflows/pre-release-CI.yml
+
+#  publish:
+#    needs: build
+#    runs-on: ubuntu-latest
+#    steps:
+#      - name: download wheels
+#        uses: actions/download-artifact@v2
+#        with:
+#          path: wheels
+#
+#      - name: debug print wheels
+#        run: |
+#          ls -lah wheels/
\ No newline at end of file