From c3386a615e3c5f0b29d79e06891541b766b13985 Mon Sep 17 00:00:00 2001 From: max furman Date: Mon, 22 Jul 2024 20:26:19 -0700 Subject: [PATCH 1/4] [ci] Fix upload of release build artifacts to s3 --- .goreleaser.yml | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index fd064aa23..681b1e067 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -262,16 +262,25 @@ release: # - glob: ./glob/foo/to/bar/file/foobar/override_from_previous blobs: - - - provider: s3 - region: us-east-1 - bucket: '{{ .Env.AWS_S3_BUCKET }}' + - provider: s3 + disable: 'false' ids: - s3-versioned - - s3-unversioned + bucket: '{{ .Env.AWS_S3_BUCKET }}' + region: us-east-1 + directory: '/' acl: public-read - disable: '{{ ne .Prerelease "" }}' + extra_files_only: false + - provider: s3 + disable: '{{ if .Prerelease }}true{{ else }}false{{ end }}' + ids: + - s3-unversioned + bucket: '{{ .Env.AWS_S3_BUCKET }}' + region: us-east-1 + directory: '/' + acl: public-read + extra_files_only: false winget: - From 149f52eac1f8a17be3932964fa72893af710b62e Mon Sep 17 00:00:00 2001 From: max furman Date: Mon, 22 Jul 2024 20:27:44 -0700 Subject: [PATCH 2/4] Shut off ci while testing --- .github/workflows/release.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 46fc02c07..b2781fe4c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,17 +7,17 @@ on: - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 jobs: - ci: - permissions: - actions: read - contents: read - security-events: write - uses: smallstep/cli/.github/workflows/ci.yml@master - secrets: inherit + #ci: + # permissions: + # actions: read + # contents: read + # security-events: write + # uses: smallstep/cli/.github/workflows/ci.yml@master + # secrets: inherit create_release: name: Create Release - needs: ci + #needs: ci runs-on: ubuntu-latest env: DOCKER_IMAGE: smallstep/step-cli From 16a07be531e715a0416a35a4428b5c1b1f0682b5 Mon Sep 17 00:00:00 2001 From: max furman Date: Mon, 22 Jul 2024 21:11:16 -0700 Subject: [PATCH 3/4] Be explicit with extra_files and glob in s3 blobs --- .goreleaser.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 681b1e067..61b5a83dc 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -270,7 +270,9 @@ blobs: region: us-east-1 directory: '/' acl: public-read - extra_files_only: false + extra_files: + - glob: ./dist/s3-versioned_*/** + extra_files_only: true - provider: s3 disable: '{{ if .Prerelease }}true{{ else }}false{{ end }}' @@ -280,7 +282,9 @@ blobs: region: us-east-1 directory: '/' acl: public-read - extra_files_only: false + extra_files: + - glob: ./dist/s3-unversioned_*/** + extra_files_only: true winget: - From e14460257ca757fe09f6e866ee61621bec5ab084 Mon Sep 17 00:00:00 2001 From: max furman Date: Mon, 22 Jul 2024 21:26:38 -0700 Subject: [PATCH 4/4] Reenable ci steps in release workflow --- .github/workflows/release.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b2781fe4c..46fc02c07 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,17 +7,17 @@ on: - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 jobs: - #ci: - # permissions: - # actions: read - # contents: read - # security-events: write - # uses: smallstep/cli/.github/workflows/ci.yml@master - # secrets: inherit + ci: + permissions: + actions: read + contents: read + security-events: write + uses: smallstep/cli/.github/workflows/ci.yml@master + secrets: inherit create_release: name: Create Release - #needs: ci + needs: ci runs-on: ubuntu-latest env: DOCKER_IMAGE: smallstep/step-cli