From b0b99e64199282d45a0cf826934a2ebcb3e63d0d Mon Sep 17 00:00:00 2001
From: dmathieu <damien.mathieu@elastic.co>
Date: Wed, 11 Feb 2026 10:04:44 +0100
Subject: [PATCH 1/2] go back to .Goos and .Goarch

---
 .goreleaser.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 0c1b3b0f..8ed20b97 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -88,10 +88,10 @@ publishers:
       - AWS_SESSION_TOKEN={{ .Env.AWS_SESSION_TOKEN }}
       - ELASTIC_LAYER_NAME=elastic-apm-extension-ver-{{ replace (trimprefix .Tag "v") "." "-" }}
       - VERSION={{ .Tag }}
-      - ARCHITECTURE={{ if eq .Runtime.Goarch "amd64" }}x86_64{{ else }}{{ .Runtime.Goarch }}{{ end }}
-      - GOOS={{ .Runtime.Goos }}
-      - GOARCH={{ .Runtime.Goarch }}
-      - AWS_FOLDER=.aws-{{ .Runtime.Goos }}-{{ .Runtime.Goarch }}
+      - ARCHITECTURE={{ if eq .Arch "amd64" }}x86_64{{ else }}{{ .Arch }}{{ end }}
+      - GOOS={{ .Os }}
+      - GOARCH={{ .Arch }}
+      - AWS_FOLDER=.aws-{{ .Os }}-{{ .Arch }}
 release:
   # Custom GitHub release
   disable: true

From 3cb8daa109cd644684c935a5d90e39a5c70fd760 Mon Sep 17 00:00:00 2001
From: dmathieu <damien.mathieu@elastic.co>
Date: Wed, 11 Feb 2026 10:13:45 +0100
Subject: [PATCH 2/2] print the environment before publish-aws

---
 .ci/publish-aws.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.ci/publish-aws.sh b/.ci/publish-aws.sh
index 50487a69..34abeeb8 100755
--- a/.ci/publish-aws.sh
+++ b/.ci/publish-aws.sh
@@ -14,6 +14,7 @@ export SUFFIX_ARN_FILE=${SUFFIX_ARN_FILE:-arn-file.md}
 # eu-west-1 is just a random region
 export AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION:-eu-west-1}
 
+printenv
 GOOS=${GOOS:?Please provide GOOS environment variable.}
 GOARCH=${GOARCH:?Please provide GOARCH environment variable.}
 ELASTIC_LAYER_NAME=${ELASTIC_LAYER_NAME:?Please provide ELASTIC_LAYER_NAME environment variable.}