From e195c836300f36cf5f4357570312c4c4923dfe81 Mon Sep 17 00:00:00 2001
From: Lev Kokotov <lev.kokotov@gmail.com>
Date: Tue, 15 Aug 2023 18:39:25 -0700
Subject: [PATCH 01/11] build the tag

---
 .../workflows/ubuntu-packages-and-docker-image.yml   | 12 ++++++++++++
 packages/postgresql-pgml/release.sh                  |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ubuntu-packages-and-docker-image.yml b/.github/workflows/ubuntu-packages-and-docker-image.yml
index f13ae93f8..c6953093f 100644
--- a/.github/workflows/ubuntu-packages-and-docker-image.yml
+++ b/.github/workflows/ubuntu-packages-and-docker-image.yml
@@ -42,6 +42,10 @@ jobs:
       run: |
         git submodule update --init --recursive
 
+        # Make sure we compile the tagged version
+        git fetch --depth 1 origin tag v${{ inputs.packageVersion }}
+        git checkout tag v${{ inputs.packageVersion }}
+
         # PostgreSQL apt
         curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg >/dev/null
         sudo sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
@@ -159,6 +163,10 @@ jobs:
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         AWS_DEFAULT_REGION: ${{ vars.AWS_DEFAULT_REGION }}
       run: |
+        # Make sure we compile the tagged version
+        git fetch --depth 1 origin tag v${{ inputs.packageVersion }}
+        git checkout tag v${{ inputs.packageVersion }}
+
        bash packages/postgresml/release.sh ${{ inputs.packageVersion }}
 
   #
@@ -181,6 +189,10 @@ jobs:
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         AWS_DEFAULT_REGION: ${{ vars.AWS_DEFAULT_REGION }}
       run: |
+        # Make sure we compile the tagged version
+        git fetch --depth 1 origin tag v${{ inputs.packageVersion }}
+        git checkout tag v${{ inputs.packageVersion }}
+
         bash packages/postgresml-dashboard/release.sh ${{ inputs.packageVersion }}
 
   #
diff --git a/packages/postgresql-pgml/release.sh b/packages/postgresql-pgml/release.sh
index 8e3118d24..f0c1fc8e6 100644
--- a/packages/postgresql-pgml/release.sh
+++ b/packages/postgresql-pgml/release.sh
@@ -41,7 +41,7 @@ for pg in {11..15}; do
     --build "$release_dir" \
     $(package_name ${pg})
 
-  deb-s3 upload \
+  echo deb-s3 upload \
     --bucket apt.postgresml.org \
     $(package_name ${pg}) \
     --codename $(lsb_release -cs)

From 33e3d71d3474a40bb9a25de8e11fbe336860653f Mon Sep 17 00:00:00 2001
From: Lev Kokotov <lev.kokotov@gmail.com>
Date: Tue, 15 Aug 2023 18:40:14 -0700
Subject: [PATCH 02/11] aha

---
 packages/postgresql-pgml/release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/postgresql-pgml/release.sh b/packages/postgresql-pgml/release.sh
index f0c1fc8e6..8e3118d24 100644
--- a/packages/postgresql-pgml/release.sh
+++ b/packages/postgresql-pgml/release.sh
@@ -41,7 +41,7 @@ for pg in {11..15}; do
     --build "$release_dir" \
     $(package_name ${pg})
 
-  echo deb-s3 upload \
+  deb-s3 upload \
     --bucket apt.postgresml.org \
     $(package_name ${pg}) \
     --codename $(lsb_release -cs)

From be1f7a0bdb707c6dd93719c426d939bf60e3f8f4 Mon Sep 17 00:00:00 2001
From: Lev Kokotov <lev.kokotov@gmail.com>
Date: Tue, 15 Aug 2023 18:41:44 -0700
Subject: [PATCH 03/11] woot

---
 .github/workflows/ubuntu-packages-and-docker-image.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ubuntu-packages-and-docker-image.yml b/.github/workflows/ubuntu-packages-and-docker-image.yml
index c6953093f..525ab2ebf 100644
--- a/.github/workflows/ubuntu-packages-and-docker-image.yml
+++ b/.github/workflows/ubuntu-packages-and-docker-image.yml
@@ -41,8 +41,6 @@ jobs:
         TZ: Etc/UTC
       run: |
         git submodule update --init --recursive
-
-        # Make sure we compile the tagged version
         git fetch --depth 1 origin tag v${{ inputs.packageVersion }}
         git checkout tag v${{ inputs.packageVersion }}
 
@@ -163,7 +161,7 @@ jobs:
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         AWS_DEFAULT_REGION: ${{ vars.AWS_DEFAULT_REGION }}
       run: |
-        # Make sure we compile the tagged version
+        git submodule update --init --recursive
         git fetch --depth 1 origin tag v${{ inputs.packageVersion }}
         git checkout tag v${{ inputs.packageVersion }}
 
@@ -189,7 +187,7 @@ jobs:
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         AWS_DEFAULT_REGION: ${{ vars.AWS_DEFAULT_REGION }}
       run: |
-        # Make sure we compile the tagged version
+        git submodule update --init --recursive
         git fetch --depth 1 origin tag v${{ inputs.packageVersion }}
         git checkout tag v${{ inputs.packageVersion }}
 

From e859ea9ebca047c7eff6d41e18f298fc729d4751 Mon Sep 17 00:00:00 2001
From: Lev Kokotov <lev.kokotov@gmail.com>
Date: Tue, 15 Aug 2023 18:42:07 -0700
Subject: [PATCH 04/11] oops

---
 .github/workflows/ubuntu-packages-and-docker-image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ubuntu-packages-and-docker-image.yml b/.github/workflows/ubuntu-packages-and-docker-image.yml
index 525ab2ebf..6033a1e0d 100644
--- a/.github/workflows/ubuntu-packages-and-docker-image.yml
+++ b/.github/workflows/ubuntu-packages-and-docker-image.yml
@@ -165,7 +165,7 @@ jobs:
         git fetch --depth 1 origin tag v${{ inputs.packageVersion }}
         git checkout tag v${{ inputs.packageVersion }}
 
-       bash packages/postgresml/release.sh ${{ inputs.packageVersion }}
+        bash packages/postgresml/release.sh ${{ inputs.packageVersion }}
 
   #
   # PostgresML dashboard.

From c2798c80afe2e6dd829bf434037037d31acb705a Mon Sep 17 00:00:00 2001
From: Lev Kokotov <lev.kokotov@gmail.com>
Date: Tue, 15 Aug 2023 18:43:40 -0700
Subject: [PATCH 05/11] tags

---
 .github/workflows/ubuntu-packages-and-docker-image.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/ubuntu-packages-and-docker-image.yml b/.github/workflows/ubuntu-packages-and-docker-image.yml
index 6033a1e0d..3eee0e358 100644
--- a/.github/workflows/ubuntu-packages-and-docker-image.yml
+++ b/.github/workflows/ubuntu-packages-and-docker-image.yml
@@ -41,6 +41,7 @@ jobs:
         TZ: Etc/UTC
       run: |
         git submodule update --init --recursive
+        git fetch --tags
         git fetch --depth 1 origin tag v${{ inputs.packageVersion }}
         git checkout tag v${{ inputs.packageVersion }}
 
@@ -162,6 +163,7 @@ jobs:
         AWS_DEFAULT_REGION: ${{ vars.AWS_DEFAULT_REGION }}
       run: |
         git submodule update --init --recursive
+        git fetch --tags
         git fetch --depth 1 origin tag v${{ inputs.packageVersion }}
         git checkout tag v${{ inputs.packageVersion }}
 
@@ -188,6 +190,7 @@ jobs:
         AWS_DEFAULT_REGION: ${{ vars.AWS_DEFAULT_REGION }}
       run: |
         git submodule update --init --recursive
+        git fetch --tags
         git fetch --depth 1 origin tag v${{ inputs.packageVersion }}
         git checkout tag v${{ inputs.packageVersion }}
 

From 13e92cbfc286a621c5de11ff3fc3408949808102 Mon Sep 17 00:00:00 2001
From: Lev Kokotov <lev.kokotov@gmail.com>
Date: Tue, 15 Aug 2023 18:45:19 -0700
Subject: [PATCH 06/11] oh come on

---
 .github/workflows/ubuntu-packages-and-docker-image.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ubuntu-packages-and-docker-image.yml b/.github/workflows/ubuntu-packages-and-docker-image.yml
index 3eee0e358..672fc1868 100644
--- a/.github/workflows/ubuntu-packages-and-docker-image.yml
+++ b/.github/workflows/ubuntu-packages-and-docker-image.yml
@@ -43,7 +43,7 @@ jobs:
         git submodule update --init --recursive
         git fetch --tags
         git fetch --depth 1 origin tag v${{ inputs.packageVersion }}
-        git checkout tag v${{ inputs.packageVersion }}
+        git checkout v${{ inputs.packageVersion }}
 
         # PostgreSQL apt
         curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg >/dev/null
@@ -165,7 +165,7 @@ jobs:
         git submodule update --init --recursive
         git fetch --tags
         git fetch --depth 1 origin tag v${{ inputs.packageVersion }}
-        git checkout tag v${{ inputs.packageVersion }}
+        git checkout v${{ inputs.packageVersion }}
 
         bash packages/postgresml/release.sh ${{ inputs.packageVersion }}
 
@@ -192,7 +192,7 @@ jobs:
         git submodule update --init --recursive
         git fetch --tags
         git fetch --depth 1 origin tag v${{ inputs.packageVersion }}
-        git checkout tag v${{ inputs.packageVersion }}
+        git checkout v${{ inputs.packageVersion }}
 
         bash packages/postgresml-dashboard/release.sh ${{ inputs.packageVersion }}
 

From dd37edf2438495692a38c04f7cd988bd1b5447f1 Mon Sep 17 00:00:00 2001
From: Lev Kokotov <lev.kokotov@gmail.com>
Date: Tue, 15 Aug 2023 18:46:44 -0700
Subject: [PATCH 07/11] next one

---
 .github/workflows/ubuntu-packages-and-docker-image.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ubuntu-packages-and-docker-image.yml b/.github/workflows/ubuntu-packages-and-docker-image.yml
index 672fc1868..00b0fd25c 100644
--- a/.github/workflows/ubuntu-packages-and-docker-image.yml
+++ b/.github/workflows/ubuntu-packages-and-docker-image.yml
@@ -43,7 +43,7 @@ jobs:
         git submodule update --init --recursive
         git fetch --tags
         git fetch --depth 1 origin tag v${{ inputs.packageVersion }}
-        git checkout v${{ inputs.packageVersion }}
+        # git checkout v${{ inputs.packageVersion }}
 
         # PostgreSQL apt
         curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg >/dev/null
@@ -165,7 +165,7 @@ jobs:
         git submodule update --init --recursive
         git fetch --tags
         git fetch --depth 1 origin tag v${{ inputs.packageVersion }}
-        git checkout v${{ inputs.packageVersion }}
+        # git checkout v${{ inputs.packageVersion }}
 
         bash packages/postgresml/release.sh ${{ inputs.packageVersion }}
 
@@ -192,7 +192,7 @@ jobs:
         git submodule update --init --recursive
         git fetch --tags
         git fetch --depth 1 origin tag v${{ inputs.packageVersion }}
-        git checkout v${{ inputs.packageVersion }}
+        # git checkout v${{ inputs.packageVersion }}
 
         bash packages/postgresml-dashboard/release.sh ${{ inputs.packageVersion }}
 

From cec51fd956635c9a7a2dd23b9889271ef0b46713 Mon Sep 17 00:00:00 2001
From: Lev Kokotov <lev.kokotov@gmail.com>
Date: Tue, 15 Aug 2023 18:49:04 -0700
Subject: [PATCH 08/11] hmm this could work

---
 .../ubuntu-packages-and-docker-image.yml          | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ubuntu-packages-and-docker-image.yml b/.github/workflows/ubuntu-packages-and-docker-image.yml
index 00b0fd25c..d5ed569f6 100644
--- a/.github/workflows/ubuntu-packages-and-docker-image.yml
+++ b/.github/workflows/ubuntu-packages-and-docker-image.yml
@@ -43,7 +43,7 @@ jobs:
         git submodule update --init --recursive
         git fetch --tags
         git fetch --depth 1 origin tag v${{ inputs.packageVersion }}
-        # git checkout v${{ inputs.packageVersion }}
+        git checkout v${{ inputs.packageVersion }}
 
         # PostgreSQL apt
         curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg >/dev/null
@@ -141,6 +141,9 @@ jobs:
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         AWS_DEFAULT_REGION: ${{ vars.AWS_DEFAULT_REGION }}
       run: |
+        # Always build using latest scripts
+        git checkout master
+
         bash packages/postgresql-pgml/release.sh ${{ inputs.packageVersion }}
 
   #
@@ -162,11 +165,6 @@ jobs:
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         AWS_DEFAULT_REGION: ${{ vars.AWS_DEFAULT_REGION }}
       run: |
-        git submodule update --init --recursive
-        git fetch --tags
-        git fetch --depth 1 origin tag v${{ inputs.packageVersion }}
-        # git checkout v${{ inputs.packageVersion }}
-
         bash packages/postgresml/release.sh ${{ inputs.packageVersion }}
 
   #
@@ -189,11 +187,6 @@ jobs:
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         AWS_DEFAULT_REGION: ${{ vars.AWS_DEFAULT_REGION }}
       run: |
-        git submodule update --init --recursive
-        git fetch --tags
-        git fetch --depth 1 origin tag v${{ inputs.packageVersion }}
-        # git checkout v${{ inputs.packageVersion }}
-
         bash packages/postgresml-dashboard/release.sh ${{ inputs.packageVersion }}
 
   #

From 33c08d3a70c2d1a2cbd7186afc87961e5c0604f7 Mon Sep 17 00:00:00 2001
From: Lev Kokotov <lev.kokotov@gmail.com>
Date: Tue, 15 Aug 2023 18:55:22 -0700
Subject: [PATCH 09/11] correct cache key

---
 .github/workflows/ubuntu-packages-and-docker-image.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ubuntu-packages-and-docker-image.yml b/.github/workflows/ubuntu-packages-and-docker-image.yml
index d5ed569f6..8d8e05f39 100644
--- a/.github/workflows/ubuntu-packages-and-docker-image.yml
+++ b/.github/workflows/ubuntu-packages-and-docker-image.yml
@@ -29,12 +29,12 @@ jobs:
       uses: buildjet/cache@v3
       with:
         path: pgml-extension/target
-        key: buildjet-pgml-extension-artifacts-1 # Change this when dependencies change
+        key: buildjet-pgml-extension-artifacts-1-${{ runner.arch }} # Change this when dependencies change
     - name: Cache pgrx
       uses: buildjet/cache@v3
       with:
         path: ~/.cargo
-        key: buildjet-pgml-extension-pgrx-2 # Change this when dependencies change
+        key: buildjet-pgml-extension-pgrx-2-${{ runner.arch }} # Change this when dependencies change
     - name: Install dependencies
       env:
         DEBIAN_FRONTEND: noninteractive

From 2f6be819ace87815a192f772cf2021d8c8c4b9b9 Mon Sep 17 00:00:00 2001
From: Lev Kokotov <lev.kokotov@gmail.com>
Date: Tue, 15 Aug 2023 18:56:04 -0700
Subject: [PATCH 10/11] maybe not

---
 .github/workflows/ubuntu-packages-and-docker-image.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ubuntu-packages-and-docker-image.yml b/.github/workflows/ubuntu-packages-and-docker-image.yml
index 8d8e05f39..e79f223d0 100644
--- a/.github/workflows/ubuntu-packages-and-docker-image.yml
+++ b/.github/workflows/ubuntu-packages-and-docker-image.yml
@@ -43,7 +43,7 @@ jobs:
         git submodule update --init --recursive
         git fetch --tags
         git fetch --depth 1 origin tag v${{ inputs.packageVersion }}
-        git checkout v${{ inputs.packageVersion }}
+        # git checkout v${{ inputs.packageVersion }}
 
         # PostgreSQL apt
         curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg >/dev/null
@@ -142,7 +142,7 @@ jobs:
         AWS_DEFAULT_REGION: ${{ vars.AWS_DEFAULT_REGION }}
       run: |
         # Always build using latest scripts
-        git checkout master
+        # git checkout master
 
         bash packages/postgresql-pgml/release.sh ${{ inputs.packageVersion }}
 

From 174de831e969903ea6d96356d4242f8ff8e47a1d Mon Sep 17 00:00:00 2001
From: Lev Kokotov <lev.kokotov@gmail.com>
Date: Tue, 15 Aug 2023 18:56:23 -0700
Subject: [PATCH 11/11] good idea

---
 .github/workflows/ubuntu-packages-and-docker-image.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ubuntu-packages-and-docker-image.yml b/.github/workflows/ubuntu-packages-and-docker-image.yml
index e79f223d0..8d8e05f39 100644
--- a/.github/workflows/ubuntu-packages-and-docker-image.yml
+++ b/.github/workflows/ubuntu-packages-and-docker-image.yml
@@ -43,7 +43,7 @@ jobs:
         git submodule update --init --recursive
         git fetch --tags
         git fetch --depth 1 origin tag v${{ inputs.packageVersion }}
-        # git checkout v${{ inputs.packageVersion }}
+        git checkout v${{ inputs.packageVersion }}
 
         # PostgreSQL apt
         curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg >/dev/null
@@ -142,7 +142,7 @@ jobs:
         AWS_DEFAULT_REGION: ${{ vars.AWS_DEFAULT_REGION }}
       run: |
         # Always build using latest scripts
-        # git checkout master
+        git checkout master
 
         bash packages/postgresql-pgml/release.sh ${{ inputs.packageVersion }}