diff --git a/.goreleaser.yml b/.goreleaser.yml index 4d066ba19c5..66c387ebda4 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -48,6 +48,7 @@ builds: - id: linux-pivkey-pkcs11key-amd64 binary: cosign-linux-pivkey-pkcs11key-amd64 + no_unique_dist_dir: true main: ./cmd/cosign flags: - -trimpath @@ -236,7 +237,6 @@ snapshot: name_template: SNAPSHOT-{{ .ShortCommit }} release: - disable: true ## not pushing to GitHub release due issues (context https://sigstore.slack.com/archives/C01PZKDL4DP/p1649162659703169?thread_ts=1649089777.081249&cid=C01PZKDL4DP) prerelease: allow # remove this when we start publishing non-prerelease or set to auto draft: true # allow for manual edits github: diff --git a/release/cloudbuild.yaml b/release/cloudbuild.yaml index fa34a9e123a..d303345dcab 100644 --- a/release/cloudbuild.yaml +++ b/release/cloudbuild.yaml @@ -32,7 +32,7 @@ steps: echo "Checking out ${_GIT_TAG}" git checkout ${_GIT_TAG} -- name: 'gcr.io/projectsigstore/cosign:v1.6.0@sha256:b667002156c4bf9fedd9273f689b800bb5c341660e710e3bbac981c9795423d9' +- name: 'gcr.io/projectsigstore/cosign:v1.7.1@sha256:7d735456ae0c6489d088981a228b944e8a729c2aa979d824a74e44ab843d6ad2' dir: "go/src/sigstore/cosign" env: - COSIGN_EXPERIMENTAL=true @@ -65,29 +65,29 @@ steps: gcloud auth configure-docker \ && make release -# - name: ghcr.io/gythialy/golang-cross:v1.17.8-1@sha256:38effe76e69a728f6c2e76b290c0d5e09fdff439926e3bbe7e69978c84c185f3 -# entrypoint: 'bash' -# dir: "go/src/sigstore/cosign" -# env: -# - "GOPATH=/workspace/go" -# - "GOBIN=/workspace/bin" -# - PROJECT_ID=${PROJECT_ID} -# - KEY_LOCATION=${_KEY_LOCATION} -# - KEY_RING=${_KEY_RING} -# - KEY_NAME=${_KEY_NAME} -# - KEY_VERSION=${_KEY_VERSION} -# - GIT_TAG=${_GIT_TAG} -# - KO_PREFIX=gcr.io/${PROJECT_ID} -# - COSIGN_EXPERIMENTAL=true -# - GOOGLE_SERVICE_ACCOUNT_NAME=keyless@${PROJECT_ID}.iam.gserviceaccount.com -# - GITHUB_USER=${_GITHUB_USER} -# secretEnv: -# - GITHUB_TOKEN -# args: -# - '-c' -# - | -# echo $$GITHUB_TOKEN | docker login ghcr.io -u $$GITHUB_USER --password-stdin \ -# && make copy-signed-release-to-ghcr +- name: ghcr.io/gythialy/golang-cross:v1.17.8-1@sha256:38effe76e69a728f6c2e76b290c0d5e09fdff439926e3bbe7e69978c84c185f3 + entrypoint: 'bash' + dir: "go/src/sigstore/cosign" + env: + - "GOPATH=/workspace/go" + - "GOBIN=/workspace/bin" + - PROJECT_ID=${PROJECT_ID} + - KEY_LOCATION=${_KEY_LOCATION} + - KEY_RING=${_KEY_RING} + - KEY_NAME=${_KEY_NAME} + - KEY_VERSION=${_KEY_VERSION} + - GIT_TAG=${_GIT_TAG} + - KO_PREFIX=gcr.io/${PROJECT_ID} + - COSIGN_EXPERIMENTAL=true + - GOOGLE_SERVICE_ACCOUNT_NAME=keyless@${PROJECT_ID}.iam.gserviceaccount.com + - GITHUB_USER=${_GITHUB_USER} + secretEnv: + - GITHUB_TOKEN + args: + - '-c' + - | + echo $$GITHUB_TOKEN | docker login ghcr.io -u $$GITHUB_USER --password-stdin \ + && make copy-signed-release-to-ghcr || true availableSecrets: secretManager: diff --git a/release/release.mk b/release/release.mk index d01ed3c80ec..05f69a043d5 100644 --- a/release/release.mk +++ b/release/release.mk @@ -4,7 +4,7 @@ # used when releasing together with GCP CloudBuild .PHONY: release release: - LDFLAGS="$(LDFLAGS)" goreleaser release --debug --timeout 120m + LDFLAGS="$(LDFLAGS)" goreleaser release --timeout 120m ###################### # sign section