Skip to content

Commit 59858fe

Browse files
authored
Merge pull request #220 from awslabs/release/v1.9.x
Update branch from release branch after releasing v1.9
2 parents edc17b5 + 99fc2c8 commit 59858fe

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

.github/workflows/release.yaml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,15 @@ on:
1313
- 'true'
1414
- 'false'
1515

16+
permissions:
17+
id-token: write
18+
contents: read
19+
1620
env:
1721
AWS_PUBLIC_ECR_REGION: us-east-1
1822
AWS_PRIVATE_ECR_REGION: us-west-2
1923
PUBLIC_REGISTRY: public.ecr.aws
24+
PUBLIC_REPO: aws-observability
2025
STAGING_REGISTRY: 611364707713.dkr.ecr.us-west-2.amazonaws.com
2126
RELEASE_IMAGE_NAME: aws-sigv4-proxy
2227
STAGING_IMAGE_NAME: aws-sigv4-proxy-staging
@@ -66,10 +71,10 @@ jobs:
6671
if: ${{ inputs.dryrunMode == 'true' }}
6772
run: |
6873
docker buildx imagetools create \
69-
--tag ${{ env.PUBLIC_REGISTRY }}/${{ env.RELEASE_IMAGE_NAME }}:latest \
70-
--tag ${{ env.PUBLIC_REGISTRY }}/${{ env.RELEASE_IMAGE_NAME }}:${{ steps.release-info.outputs.release-version }} \
71-
--tag ${{ env.PUBLIC_REGISTRY }}/${{ env.RELEASE_IMAGE_NAME }}:${{ steps.release-info.outputs.commit-short-sha }} \
72-
${{ env.STAGING_REGISTRY }}/${{ env.STAGING_IMAGE_NAME }}:${{ steps.release-info.outputs.commit-short-sha }}
74+
--tag ${{ env.PUBLIC_REGISTRY }}/${{ env.PUBLIC_REPO }}/${{ env.RELEASE_IMAGE_NAME }}:latest \
75+
--tag ${{ env.PUBLIC_REGISTRY }}/${{ env.PUBLIC_REPO }}/${{ env.RELEASE_IMAGE_NAME }}:${{ steps.release-info.outputs.release-version }} \
76+
--tag ${{ env.PUBLIC_REGISTRY }}/${{ env.PUBLIC_REPO }}/${{ env.RELEASE_IMAGE_NAME }}:${{ steps.release-info.outputs.commit-short-sha }} \
77+
${{ env.STAGING_REGISTRY }}/${{ env.STAGING_IMAGE_NAME }}:${{ steps.release-info.outputs.commit-short-sha }} \
7378
--dry-run
7479
7580
- name: Create release - dryrun
@@ -78,15 +83,15 @@ jobs:
7883
echo gh release create --target "$GITHUB_REF_NAME" \
7984
--title "Release v${{ steps.release-info.outputs.release-version }}" \
8085
--draft \
81-
"v${{ steps.release-info.outputs.release-version }}" \
86+
"v${{ steps.release-info.outputs.release-version }}"
8287
8388
- name: Push image to public ecr
8489
if: ${{ inputs.dryrunMode == 'false' }}
8590
run: |
8691
docker buildx imagetools create \
87-
--tag ${{ env.PUBLIC_REGISTRY }}/${{ env.RELEASE_IMAGE_NAME }}:latest \
88-
--tag ${{ env.PUBLIC_REGISTRY }}/${{ env.RELEASE_IMAGE_NAME }}:${{ steps.release-info.outputs.release-version }} \
89-
--tag ${{ env.PUBLIC_REGISTRY }}/${{ env.RELEASE_IMAGE_NAME }}:${{ steps.release-info.outputs.commit-short-sha }} \
92+
--tag ${{ env.PUBLIC_REGISTRY }}/${{ env.PUBLIC_REPO }}/${{ env.RELEASE_IMAGE_NAME }}:latest \
93+
--tag ${{ env.PUBLIC_REGISTRY }}/${{ env.PUBLIC_REPO }}/${{ env.RELEASE_IMAGE_NAME }}:${{ steps.release-info.outputs.release-version }} \
94+
--tag ${{ env.PUBLIC_REGISTRY }}/${{ env.PUBLIC_REPO }}/${{ env.RELEASE_IMAGE_NAME }}:${{ steps.release-info.outputs.commit-short-sha }} \
9095
${{ env.STAGING_REGISTRY }}/${{ env.STAGING_IMAGE_NAME }}:${{ steps.release-info.outputs.commit-short-sha }}
9196
9297
- name: Create release
@@ -97,4 +102,4 @@ jobs:
97102
gh release create --target "$GITHUB_REF_NAME" \
98103
--title "Release v${{ steps.release-info.outputs.release-version }}" \
99104
--draft \
100-
"v${{ steps.release-info.outputs.release-version }}" \
105+
"v${{ steps.release-info.outputs.release-version }}"

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.8
1+
1.9

0 commit comments

Comments
 (0)