From 2638081dbc22cff56f25df87035c4a7e1a2b6634 Mon Sep 17 00:00:00 2001 From: Janos Pasztor Date: Tue, 16 Mar 2021 12:05:58 +0100 Subject: [PATCH 1/4] Removed GPG signing from release --- .github/workflows/release.yml | 17 ----------------- .goreleaser.yml | 10 ---------- 2 files changed, 27 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a040c20b..e96164f8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,14 +1,5 @@ # This GitHub action can publish assets for release when a tag is created. # Currently its setup to run on any tag that matches the pattern "v*" (ie. v0.1.0). -# -# This uses an action (paultyng/ghaction-import-gpg) that assumes you set your -# private key in the `GPG_PRIVATE_KEY` secret and passphrase in the `PASSPHRASE` -# secret. If you would rather own your own GPG handling, please fork this action -# or use an alternative one for key handling. -# -# You will need to pass the `--batch` flag to `gpg` in your signing step -# in `goreleaser` to indicate this is being used in a non-interactive mode. -# name: release on: push: @@ -29,13 +20,6 @@ jobs: uses: actions/setup-go@v2 with: go-version: 1.14 - - - name: Import GPG key - id: import_gpg - uses: paultyng/ghaction-import-gpg@v2.1.0 - env: - GPG_PRIVATE_KEY: ${{ secrets.GPG_TERRAFORM_REGISTRY }} - PASSPHRASE: ${{ secrets.PASSPHRASE }} - name: Run GoReleaser uses: goreleaser/goreleaser-action@v2 @@ -43,5 +27,4 @@ jobs: version: latest args: release --rm-dist env: - GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.goreleaser.yml b/.goreleaser.yml index 2e5e509c..1cf3d414 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -26,16 +26,6 @@ archives: checksum: name_template: '{{ .ProjectName }}_{{ .Version }}_SHA256SUMS' algorithm: sha256 -signs: - - artifacts: checksum - args: - - "--batch" - - "--local-user" - - "{{ .Env.GPG_FINGERPRINT }}" # set this environment variable for your signing key - - "--output" - - "${signature}" - - "--detach-sign" - - "${artifact}" release: draft: true changelog: From da58500bd2c22ac25fdeadc9e29c07d93a334a0c Mon Sep 17 00:00:00 2001 From: Janos Pasztor Date: Tue, 16 Mar 2021 12:10:26 +0100 Subject: [PATCH 2/4] Build fixes --- .github/workflows/pr.yml | 33 +++++++++++++++++++++++++++++++++ .github/workflows/release.yml | 2 +- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/pr.yml diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml new file mode 100644 index 00000000..50e8fdd2 --- /dev/null +++ b/.github/workflows/pr.yml @@ -0,0 +1,33 @@ +# This GitHub action can publish assets for release when a tag is created. +# Currently its setup to run on any tag that matches the pattern "v*" (ie. v0.1.0). +name: pull-request +on: + pull_request: + branches: + - '*' + push: + branches: + - '*' + tags-ignore: + - 'v*' +jobs: + goreleaser: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v2 + - + name: Unshallow + run: git fetch --prune --unshallow + - + name: Set up Go + uses: actions/setup-go@v2 + with: + go-version: 1.16 + - + name: Run GoReleaser + uses: goreleaser/goreleaser-action@v2 + with: + version: latest + args: release --rm-dist --snapshot diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e96164f8..02af22c6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.14 + go-version: 1.16 - name: Run GoReleaser uses: goreleaser/goreleaser-action@v2 From 1995ef4b7246cd412300a75c9604412c443b6a9d Mon Sep 17 00:00:00 2001 From: Janos Pasztor Date: Tue, 16 Mar 2021 15:45:27 +0100 Subject: [PATCH 3/4] Revert to Go 1.14 (waiting for Terraform #27257) --- .github/workflows/pr.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 50e8fdd2..df0764bc 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -24,7 +24,7 @@ jobs: name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.14 - name: Run GoReleaser uses: goreleaser/goreleaser-action@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 02af22c6..e96164f8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.14 - name: Run GoReleaser uses: goreleaser/goreleaser-action@v2 From edf2dd7acb2a2cf568b2c9730003dc93a9f8d5d2 Mon Sep 17 00:00:00 2001 From: Janos Pasztor Date: Tue, 16 Mar 2021 15:55:16 +0100 Subject: [PATCH 4/4] Removed double v from version --- .goreleaser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 1cf3d414..ad13d8ed 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -19,7 +19,7 @@ builds: ignore: - goos: darwin goarch: '386' - binary: '{{ .ProjectName }}_v{{ .Version }}' + binary: '{{ .ProjectName }}_{{ .Version }}' archives: - format: zip name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}'