Go back to using .Os and .Arch in publisher step (#748)

* go back to .Goos and .Goarch

* print the environment before publish-aws

Author: dmathieu

.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.}

.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