From 009b4bf0fbbeda90dc18b23198316e4e3c64db99 Mon Sep 17 00:00:00 2001
From: "Chayim I. Kirshen" <c@kirshen.com>
Date: Thu, 29 Dec 2022 13:39:09 +0200
Subject: [PATCH 1/9] jammy amd

---
 .github/workflows/RELEASE_REUSE.yml | 38 +++++++++++++++++------------
 .github/workflows/release.yml       |  6 +++--
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/RELEASE_REUSE.yml b/.github/workflows/RELEASE_REUSE.yml
index 3bfc344..53b86f5 100644
--- a/.github/workflows/RELEASE_REUSE.yml
+++ b/.github/workflows/RELEASE_REUSE.yml
@@ -100,18 +100,26 @@ jobs:
 
       - name: publish debs
         run: |
-          s3cmd get ${{inputs.s3root}}/*${{ steps.get_version.outputs.VERSION }}*${{ inputs.osnick }}*${{ inputs.arch }}.deb .
-          echo allow-preset-passphrase > ~/.gnupg/gpg-agent.conf
-          gpg-connect-agent reloadagent /bye
-          /usr/lib/gnupg/gpg-preset-passphrase -P '${{ secrets.GPG_PASSWORD }}' -c --preset ${{ steps.get_gpg_keygrip.outputs.GPG_KEYGRIP }}
-          deb-s3 upload --s3-region us-east-2 \
-            --bucket ${{inputs.s3publicreponame}} \
-            --codename ${{ inputs.osnick }} \
-            --preserve-versions \
-            --sign ${{steps.get_gpg_id.outputs.GPG_ID}} \
-            --prefix \
-            deb \
-            *${{ inputs.osnick }}*.deb
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.PACKAGES_AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY : ${{ secrets.PACKAGES_AWS_SECRET_ACCESS_KEY}}
+          arch=${{inputs.arch}}
+          if [ ${{inputs.arch}} == "amd64" ]; then
+              arch="x86_64"
+          fi
+          s3cmd get ${{inputs.s3root}}/*${{ steps.get_version.outputs.VERSION }}*${{ inputs.osnick }}*${arch}.deb .
+          for i in `ls *${arch}*.deb`; do
+            mv $i `echo $i|sed -e 's/${arch}/${{inputs.arch}}'`
+          done
+          ls
+#          echo allow-preset-passphrase > ~/.gnupg/gpg-agent.conf
+#          gpg-connect-agent reloadagent /bye
+#          /usr/lib/gnupg/gpg-preset-passphrase -P '${{ secrets.GPG_PASSWORD }}' -c --preset ${{ steps.get_gpg_keygrip.outputs.GPG_KEYGRIP }}
+#          deb-s3 upload --s3-region us-east-2 \
+#            --bucket ${{inputs.s3publicreponame}} \
+#            --codename ${{ inputs.osnick }} \
+#            --preserve-versions \
+#            --sign ${{steps.get_gpg_id.outputs.GPG_ID}} \
+#            --prefix \
+#            deb \
+#            *${{ inputs.osnick }}*.deb
+#        env:
+#          AWS_ACCESS_KEY_ID: ${{ secrets.PACKAGES_AWS_ACCESS_KEY_ID }}
+#          AWS_SECRET_ACCESS_KEY : ${{ secrets.PACKAGES_AWS_SECRET_ACCESS_KEY}}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 57a5935..9d7b4f7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,8 +2,8 @@ name: Publish DEBs
 
 on:
   push:
-    tags:
-      - '*'
+#    tags:
+#      - '*'
 
 jobs:
 
@@ -64,10 +64,12 @@ jobs:
       GPG_PASSWORD: ${{secrets.GPG_PASSWORD}}
       GPG_KEY: ${{secrets.GPG_KEY}}
 
+  # until we solve amd64 vs x86_64 forever, this should work
   jammy-x86:
     uses: ./.github/workflows/RELEASE_REUSE.yml
     with:
       osnick: jammy
+      arch: amd64
       s3root: s3://redismodules/redis-stack
       s3publicreponame: packages.redis.io
     secrets:

From a18e18ff9e6a09c54df180d7f154f7479299eff5 Mon Sep 17 00:00:00 2001
From: "Chayim I. Kirshen" <c@kirshen.com>
Date: Thu, 29 Dec 2022 13:41:40 +0200
Subject: [PATCH 2/9] hardcoding for testing

---
 .github/workflows/RELEASE_REUSE.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/RELEASE_REUSE.yml b/.github/workflows/RELEASE_REUSE.yml
index 53b86f5..e0e8f93 100644
--- a/.github/workflows/RELEASE_REUSE.yml
+++ b/.github/workflows/RELEASE_REUSE.yml
@@ -51,7 +51,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           repository: redis-stack/redis-stack
-          ref: ${{steps.get_tag_version.outputs.VERSION}}
+          ref: master #${{steps.get_tag_version.outputs.VERSION}}
 
       - name: install python
         uses: actions/setup-python@v2

From 1c20a1baf26ddc2e74239d128874e83a4d247b69 Mon Sep 17 00:00:00 2001
From: "Chayim I. Kirshen" <c@kirshen.com>
Date: Thu, 29 Dec 2022 14:01:59 +0200
Subject: [PATCH 3/9] using a released version

---
 .github/workflows/RELEASE_REUSE.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/RELEASE_REUSE.yml b/.github/workflows/RELEASE_REUSE.yml
index e0e8f93..ed73d6c 100644
--- a/.github/workflows/RELEASE_REUSE.yml
+++ b/.github/workflows/RELEASE_REUSE.yml
@@ -51,7 +51,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           repository: redis-stack/redis-stack
-          ref: master #${{steps.get_tag_version.outputs.VERSION}}
+          ref: 6.2 #${{steps.get_tag_version.outputs.VERSION}}
 
       - name: install python
         uses: actions/setup-python@v2

From 06d60983db01203afcad0e8d234e4c9aefab0173 Mon Sep 17 00:00:00 2001
From: "Chayim I. Kirshen" <c@kirshen.com>
Date: Thu, 29 Dec 2022 14:06:46 +0200
Subject: [PATCH 4/9] one

---
 .github/workflows/RELEASE_REUSE.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/RELEASE_REUSE.yml b/.github/workflows/RELEASE_REUSE.yml
index ed73d6c..979620d 100644
--- a/.github/workflows/RELEASE_REUSE.yml
+++ b/.github/workflows/RELEASE_REUSE.yml
@@ -51,7 +51,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           repository: redis-stack/redis-stack
-          ref: 6.2 #${{steps.get_tag_version.outputs.VERSION}}
+          ref: ${{steps.get_tag_version.outputs.VERSION}}
 
       - name: install python
         uses: actions/setup-python@v2
@@ -104,7 +104,9 @@ jobs:
           if [ ${{inputs.arch}} == "amd64" ]; then
               arch="x86_64"
           fi
-          s3cmd get ${{inputs.s3root}}/*${{ steps.get_version.outputs.VERSION }}*${{ inputs.osnick }}*${arch}.deb .
+          ls
+          s3cmd get ${{inputs.s3root}}/*7.0.6-RC2*${{ inputs.osnick }}*${arch}.deb .
+          ls
           for i in `ls *${arch}*.deb`; do
             mv $i `echo $i|sed -e 's/${arch}/${{inputs.arch}}'`
           done

From be982c490b04627ec5ed58e852a96a50be60dfb7 Mon Sep 17 00:00:00 2001
From: "Chayim I. Kirshen" <c@kirshen.com>
Date: Thu, 29 Dec 2022 14:10:11 +0200
Subject: [PATCH 5/9] tax

---
 .github/workflows/RELEASE_REUSE.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/RELEASE_REUSE.yml b/.github/workflows/RELEASE_REUSE.yml
index 979620d..bdaa95d 100644
--- a/.github/workflows/RELEASE_REUSE.yml
+++ b/.github/workflows/RELEASE_REUSE.yml
@@ -51,7 +51,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           repository: redis-stack/redis-stack
-          ref: ${{steps.get_tag_version.outputs.VERSION}}
+          ref: master # ${{steps.get_tag_version.outputs.VERSION}}
 
       - name: install python
         uses: actions/setup-python@v2

From 088148fbd1e895d50d727f63acce12b33137566d Mon Sep 17 00:00:00 2001
From: "Chayim I. Kirshen" <c@kirshen.com>
Date: Thu, 29 Dec 2022 14:11:58 +0200
Subject: [PATCH 6/9] closing sed

---
 .github/workflows/RELEASE_REUSE.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/RELEASE_REUSE.yml b/.github/workflows/RELEASE_REUSE.yml
index bdaa95d..d9519ea 100644
--- a/.github/workflows/RELEASE_REUSE.yml
+++ b/.github/workflows/RELEASE_REUSE.yml
@@ -108,7 +108,7 @@ jobs:
           s3cmd get ${{inputs.s3root}}/*7.0.6-RC2*${{ inputs.osnick }}*${arch}.deb .
           ls
           for i in `ls *${arch}*.deb`; do
-            mv $i `echo $i|sed -e 's/${arch}/${{inputs.arch}}'`
+            mv $i `echo $i|sed -e 's/${arch}/${{inputs.arch}}/'`
           done
           ls
 #          echo allow-preset-passphrase > ~/.gnupg/gpg-agent.conf

From 39ecdce31a56288f1fedf65a3f40e531c255be36 Mon Sep 17 00:00:00 2001
From: "Chayim I. Kirshen" <c@kirshen.com>
Date: Thu, 29 Dec 2022 14:26:52 +0200
Subject: [PATCH 7/9] allowing for dest_arch

---
 .github/workflows/RELEASE_REUSE.yml | 16 ++++++----------
 .github/workflows/release.yml       |  6 +++++-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/RELEASE_REUSE.yml b/.github/workflows/RELEASE_REUSE.yml
index d9519ea..8caf1f3 100644
--- a/.github/workflows/RELEASE_REUSE.yml
+++ b/.github/workflows/RELEASE_REUSE.yml
@@ -14,6 +14,10 @@ on:
         type: string
         required: false
         default: x86_64
+      dest_arch:
+        type: string
+        required: false
+        default: x86_64
       rubyversion:
         default: 2.7.2
         type: string
@@ -100,16 +104,8 @@ jobs:
 
       - name: publish debs
         run: |
-          arch=${{inputs.arch}}
-          if [ ${{inputs.arch}} == "amd64" ]; then
-              arch="x86_64"
-          fi
-          ls
-          s3cmd get ${{inputs.s3root}}/*7.0.6-RC2*${{ inputs.osnick }}*${arch}.deb .
-          ls
-          for i in `ls *${arch}*.deb`; do
-            mv $i `echo $i|sed -e 's/${arch}/${{inputs.arch}}/'`
-          done
+          s3cmd get ${{inputs.s3root}}/redis-stack-server-7.0.6-RC2.${{ inputs.osnick }}.${{ inputs.arch }}.deb \
+            ${{inputs.s3root}}/redis-stack-server-7.0.6-RC2.${{ inputs.osnick }}.${{ inputs.dest_arch }}.deb
           ls
 #          echo allow-preset-passphrase > ~/.gnupg/gpg-agent.conf
 #          gpg-connect-agent reloadagent /bye
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9d7b4f7..f46ddbf 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,6 +11,7 @@ jobs:
     uses: ./.github/workflows/RELEASE_REUSE.yml
     with:
       osnick: bullseye
+      dest_arch: amd64
       s3root: s3://redismodules/redis-stack
       s3publicreponame: packages.redis.io
     secrets:
@@ -69,7 +70,7 @@ jobs:
     uses: ./.github/workflows/RELEASE_REUSE.yml
     with:
       osnick: jammy
-      arch: amd64
+      dest_arch: amd64
       s3root: s3://redismodules/redis-stack
       s3publicreponame: packages.redis.io
     secrets:
@@ -85,6 +86,7 @@ jobs:
     with:
       osnick: bionic
       arch: arm64
+      dest_arch: arm64
       s3root: s3://redismodules/redis-stack
       s3publicreponame: packages.redis.io
     secrets:
@@ -100,6 +102,7 @@ jobs:
     with:
       osnick: focal
       arch: arm64
+      dest_arch: arm64
       s3root: s3://redismodules/redis-stack
       s3publicreponame: packages.redis.io
     secrets:
@@ -115,6 +118,7 @@ jobs:
     with:
       osnick: jammy
       arch: arm64
+      dest_arch: arm64
       s3root: s3://redismodules/redis-stack
       s3publicreponame: packages.redis.io
     secrets:

From e726d7ae29bcafeabe17fb859a0a0eb4d98409a7 Mon Sep 17 00:00:00 2001
From: "Chayim I. Kirshen" <c@kirshen.com>
Date: Thu, 29 Dec 2022 14:32:18 +0200
Subject: [PATCH 8/9] local path

---
 .github/workflows/RELEASE_REUSE.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/RELEASE_REUSE.yml b/.github/workflows/RELEASE_REUSE.yml
index 8caf1f3..7b788fe 100644
--- a/.github/workflows/RELEASE_REUSE.yml
+++ b/.github/workflows/RELEASE_REUSE.yml
@@ -105,7 +105,7 @@ jobs:
       - name: publish debs
         run: |
           s3cmd get ${{inputs.s3root}}/redis-stack-server-7.0.6-RC2.${{ inputs.osnick }}.${{ inputs.arch }}.deb \
-            ${{inputs.s3root}}/redis-stack-server-7.0.6-RC2.${{ inputs.osnick }}.${{ inputs.dest_arch }}.deb
+            redis-stack-server-7.0.6-RC2.${{ inputs.osnick }}.${{ inputs.dest_arch }}.deb
           ls
 #          echo allow-preset-passphrase > ~/.gnupg/gpg-agent.conf
 #          gpg-connect-agent reloadagent /bye

From 5d6bfe0f2a28b347cdff5b7124637ca1ababc761 Mon Sep 17 00:00:00 2001
From: "Chayim I. Kirshen" <c@kirshen.com>
Date: Thu, 29 Dec 2022 14:40:54 +0200
Subject: [PATCH 9/9] restoring running rules

---
 .github/workflows/RELEASE_REUSE.yml | 30 ++++++++++++++---------------
 .github/workflows/release.yml       |  4 ++--
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/RELEASE_REUSE.yml b/.github/workflows/RELEASE_REUSE.yml
index 7b788fe..505c461 100644
--- a/.github/workflows/RELEASE_REUSE.yml
+++ b/.github/workflows/RELEASE_REUSE.yml
@@ -55,7 +55,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           repository: redis-stack/redis-stack
-          ref: master # ${{steps.get_tag_version.outputs.VERSION}}
+          ref: ${{steps.get_tag_version.outputs.VERSION}}
 
       - name: install python
         uses: actions/setup-python@v2
@@ -107,17 +107,17 @@ jobs:
           s3cmd get ${{inputs.s3root}}/redis-stack-server-7.0.6-RC2.${{ inputs.osnick }}.${{ inputs.arch }}.deb \
             redis-stack-server-7.0.6-RC2.${{ inputs.osnick }}.${{ inputs.dest_arch }}.deb
           ls
-#          echo allow-preset-passphrase > ~/.gnupg/gpg-agent.conf
-#          gpg-connect-agent reloadagent /bye
-#          /usr/lib/gnupg/gpg-preset-passphrase -P '${{ secrets.GPG_PASSWORD }}' -c --preset ${{ steps.get_gpg_keygrip.outputs.GPG_KEYGRIP }}
-#          deb-s3 upload --s3-region us-east-2 \
-#            --bucket ${{inputs.s3publicreponame}} \
-#            --codename ${{ inputs.osnick }} \
-#            --preserve-versions \
-#            --sign ${{steps.get_gpg_id.outputs.GPG_ID}} \
-#            --prefix \
-#            deb \
-#            *${{ inputs.osnick }}*.deb
-#        env:
-#          AWS_ACCESS_KEY_ID: ${{ secrets.PACKAGES_AWS_ACCESS_KEY_ID }}
-#          AWS_SECRET_ACCESS_KEY : ${{ secrets.PACKAGES_AWS_SECRET_ACCESS_KEY}}
+          echo allow-preset-passphrase > ~/.gnupg/gpg-agent.conf
+          gpg-connect-agent reloadagent /bye
+          /usr/lib/gnupg/gpg-preset-passphrase -P '${{ secrets.GPG_PASSWORD }}' -c --preset ${{ steps.get_gpg_keygrip.outputs.GPG_KEYGRIP }}
+          deb-s3 upload --s3-region us-east-2 \
+            --bucket ${{inputs.s3publicreponame}} \
+            --codename ${{ inputs.osnick }} \
+            --preserve-versions \
+            --sign ${{steps.get_gpg_id.outputs.GPG_ID}} \
+            --prefix \
+            deb \
+            *${{ inputs.osnick }}*.deb
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.PACKAGES_AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY : ${{ secrets.PACKAGES_AWS_SECRET_ACCESS_KEY}}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f46ddbf..aa10db9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,8 +2,8 @@ name: Publish DEBs
 
 on:
   push:
-#    tags:
-#      - '*'
+    tags:
+      - '*'
 
 jobs: