From 06d877fa15f81671e6fd27776d0cacdf8fef001c Mon Sep 17 00:00:00 2001
From: jacekwegr <jacek.wegrzynowski@erlang-solutions.com>
Date: Thu, 12 Dec 2024 17:17:00 +0100
Subject: [PATCH 1/2] Upload packages to a new bucket

---
 .circleci/template.yml | 16 +++++-----------
 tools/pkg/publish.sh   | 16 ++++++++++------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/.circleci/template.yml b/.circleci/template.yml
index 008089dccda..f3266a76219 100644
--- a/.circleci/template.yml
+++ b/.circleci/template.yml
@@ -712,16 +712,10 @@ jobs:
           command: |
             ./tools/circle-install-packages.sh rpm
             ./tools/pkg/verify_arch.sh
-      - when:
-          condition:
-            matches:
-              pattern: /^\d+\.\d+\.\d+/
-              value: << pipeline.git.tag >>
-          steps:
-            - run:
-                name: Publish package
-                command: |
-                  ./tools/pkg/publish.sh
+      - run:
+          name: Publish package
+          command: |
+            ./tools/pkg/publish.sh
 
 filters:
   - &all_tags
@@ -730,7 +724,7 @@ filters:
   - &all_tags_and_master
     <<: *all_tags
     branches:
-      only: master
+      only: package-publishing
 
 workflows:
   version: 2
diff --git a/tools/pkg/publish.sh b/tools/pkg/publish.sh
index 177cdcb661f..7a8938c06c4 100755
--- a/tools/pkg/publish.sh
+++ b/tools/pkg/publish.sh
@@ -4,18 +4,22 @@ set -e
 
 cd tools/pkg/packages
 PACKAGE_NAME=$(ls)
-PKG_PROFILE=packages
-prefix=${pkg_PLATFORM/_//}
+prefix=$(git rev-parse --short HEAD)
 
 if which aws ; then
     echo "aws tool ready"
 else
-    curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+    curl "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -m).zip" -o "awscliv2.zip"
     unzip -q awscliv2.zip
     sudo ./aws/install
 fi
 
-aws configure set aws_access_key_id "$PKG_ACCESS_KEY_ID" --profile "$PKG_PROFILE"
-aws configure set aws_secret_access_key "$PKG_SECRET_ACCESS_KEY" --profile "$PKG_PROFILE"
+aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID
+aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY
+aws configure set default.region $AWS_DEFAULT_REGION
 
-aws s3 cp "$PACKAGE_NAME" "s3://arn:aws:s3:$PKG_AWS_REGION:$PKG_USER_ID:accesspoint/mim-packages/$prefix/$PACKAGE_NAME" --acl public-read --profile "$PKG_PROFILE" --region "$PKG_AWS_REGION"
+if [ -n "$CIRCLE_TAG" ]; then
+    aws s3 cp "${PACKAGE_NAME}" "s3://mim-packages/tags/${CIRCLE_TAG}/${PACKAGE_NAME}" --acl public-read --quiet
+else
+    aws s3 cp "${PACKAGE_NAME}" "s3://mim-packages/branches/${CIRCLE_BRANCH}/${prefix}/${PACKAGE_NAME}" --acl public-read --quiet
+fi

From 594520e7c87090d05bf43f3da098a749f2640c86 Mon Sep 17 00:00:00 2001
From: jacekwegr <jacek.wegrzynowski@erlang-solutions.com>
Date: Mon, 16 Dec 2024 13:37:57 +0100
Subject: [PATCH 2/2] Change publishing packages job back to master

---
 .circleci/template.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/template.yml b/.circleci/template.yml
index f3266a76219..a8039b8fddf 100644
--- a/.circleci/template.yml
+++ b/.circleci/template.yml
@@ -724,7 +724,7 @@ filters:
   - &all_tags_and_master
     <<: *all_tags
     branches:
-      only: package-publishing
+      only: master
 
 workflows:
   version: 2