From be71f7c6aea3fd663e0f059df1d8060c2f6e916d Mon Sep 17 00:00:00 2001 From: Alex Goodman Date: Wed, 22 Feb 2023 16:34:11 -0500 Subject: [PATCH] disable changelog, version file updates, brew, and some docker tags on release Signed-off-by: Alex Goodman --- .goreleaser.yaml | 88 ++++++++++++++++++++++++------------------------ Makefile | 6 +--- go.sum | 2 -- 3 files changed, 45 insertions(+), 51 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index d4e05af8e..63dfc8db4 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -79,23 +79,23 @@ nfpms: - rpm - deb -brews: - - tap: - owner: anchore - name: homebrew-syft - token: "{{.Env.GITHUB_BREW_TOKEN}}" - ids: - - darwin-archives - - linux-archives - homepage: *website - description: *description - license: "Apache License 2.0" +#brews: +# - tap: +# owner: anchore +# name: homebrew-syft +# token: "{{.Env.GITHUB_BREW_TOKEN}}" +# ids: +# - darwin-archives +# - linux-archives +# homepage: *website +# description: *description +# license: "Apache License 2.0" dockers: - image_templates: - - anchore/syft:debug +# - anchore/syft:debug - anchore/syft:{{.Tag}}-debug - - ghcr.io/anchore/syft:debug +# - ghcr.io/anchore/syft:debug - ghcr.io/anchore/syft:{{.Tag}}-debug goarch: amd64 dockerfile: Dockerfile.debug @@ -108,9 +108,9 @@ dockers: - "--build-arg=VCS_URL={{.GitURL}}" - image_templates: - - anchore/syft:debug-arm64v8 +# - anchore/syft:debug-arm64v8 - anchore/syft:{{.Tag}}-debug-arm64v8 - - ghcr.io/anchore/syft:debug-arm64v8 +# - ghcr.io/anchore/syft:debug-arm64v8 - ghcr.io/anchore/syft:{{.Tag}}-debug-arm64v8 goarch: arm64 dockerfile: Dockerfile.debug @@ -123,9 +123,9 @@ dockers: - "--build-arg=VCS_URL={{.GitURL}}" - image_templates: - - anchore/syft:debug-ppc64le +# - anchore/syft:debug-ppc64le - anchore/syft:{{.Tag}}-debug-ppc64le - - ghcr.io/anchore/syft:debug-ppc64le +# - ghcr.io/anchore/syft:debug-ppc64le - ghcr.io/anchore/syft:{{.Tag}}-debug-ppc64le goarch: ppc64le dockerfile: Dockerfile.debug @@ -138,9 +138,9 @@ dockers: - "--build-arg=VCS_URL={{.GitURL}}" - image_templates: - - anchore/syft:debug-s390x +# - anchore/syft:debug-s390x - anchore/syft:{{.Tag}}-debug-s390x - - ghcr.io/anchore/syft:debug-s390x +# - ghcr.io/anchore/syft:debug-s390x - ghcr.io/anchore/syft:{{.Tag}}-debug-s390x goarch: s390x dockerfile: Dockerfile.debug @@ -153,9 +153,9 @@ dockers: - "--build-arg=VCS_URL={{.GitURL}}" - image_templates: - - anchore/syft:latest +# - anchore/syft:latest - anchore/syft:{{.Tag}} - - ghcr.io/anchore/syft:latest +# - ghcr.io/anchore/syft:latest - ghcr.io/anchore/syft:{{.Tag}} goarch: amd64 dockerfile: Dockerfile @@ -207,18 +207,18 @@ dockers: - "--build-arg=VCS_URL={{.GitURL}}" docker_manifests: - - name_template: anchore/syft:latest - image_templates: - - anchore/syft:{{.Tag}} - - anchore/syft:{{.Tag}}-arm64v8 - - anchore/syft:{{.Tag}}-ppc64le - - anchore/syft:{{.Tag}}-s390x +# - name_template: anchore/syft:latest +# image_templates: +# - anchore/syft:{{.Tag}} +# - anchore/syft:{{.Tag}}-arm64v8 +# - anchore/syft:{{.Tag}}-ppc64le +# - anchore/syft:{{.Tag}}-s390x - - name_template: anchore/syft:debug - - anchore/syft:{{.Tag}}-debug - - anchore/syft:{{.Tag}}-debug-arm64v8 - - anchore/syft:{{.Tag}}-debug-ppc64le - - anchore/syft:{{.Tag}}-debug-s390x +# - name_template: anchore/syft:debug +# - anchore/syft:{{.Tag}}-debug +# - anchore/syft:{{.Tag}}-debug-arm64v8 +# - anchore/syft:{{.Tag}}-debug-ppc64le +# - anchore/syft:{{.Tag}}-debug-s390x - name_template: anchore/syft:{{.Tag}} image_templates: @@ -227,19 +227,19 @@ docker_manifests: - anchore/syft:{{.Tag}}-ppc64le - anchore/syft:{{.Tag}}-s390x - - name_template: ghcr.io/anchore/syft:latest - image_templates: - - ghcr.io/anchore/syft:{{.Tag}} - - ghcr.io/anchore/syft:{{.Tag}}-arm64v8 - - ghcr.io/anchore/syft:{{.Tag}}-ppc64le - - ghcr.io/anchore/syft:{{.Tag}}-s390x +# - name_template: ghcr.io/anchore/syft:latest +# image_templates: +# - ghcr.io/anchore/syft:{{.Tag}} +# - ghcr.io/anchore/syft:{{.Tag}}-arm64v8 +# - ghcr.io/anchore/syft:{{.Tag}}-ppc64le +# - ghcr.io/anchore/syft:{{.Tag}}-s390x - - name_template: ghcr.io/anchore/syft:debug - image_templates: - - ghcr.io/anchore/syft:{{.Tag}}-debug - - ghcr.io/anchore/syft:{{.Tag}}-debug-arm64v8 - - ghcr.io/anchore/syft:{{.Tag}}-debug-ppc64le - - ghcr.io/anchore/syft:{{.Tag}}-debug-s390x +# - name_template: ghcr.io/anchore/syft:debug +# image_templates: +# - ghcr.io/anchore/syft:{{.Tag}}-debug +# - ghcr.io/anchore/syft:{{.Tag}}-debug-arm64v8 +# - ghcr.io/anchore/syft:{{.Tag}}-debug-ppc64le +# - ghcr.io/anchore/syft:{{.Tag}}-debug-s390x - name_template: ghcr.io/anchore/syft:{{.Tag}} image_templates: diff --git a/Makefile b/Makefile index 46423b2bb..dc39122ca 100644 --- a/Makefile +++ b/Makefile @@ -320,7 +320,7 @@ release: @.github/scripts/trigger-release.sh .PHONY: ci-release -ci-release: ci-check clean-dist $(CHANGELOG) +ci-release: ci-check clean-dist $(call title,Publishing release artifacts) # create a config with the dist dir overridden @@ -330,12 +330,8 @@ ci-release: ci-check clean-dist $(CHANGELOG) bash -c "\ $(RELEASE_CMD) \ --config $(TEMP_DIR)/goreleaser.yaml \ - --release-notes <(cat $(CHANGELOG)) \ || (cat /tmp/quill-*.log && false)" - # upload the version file that supports the application version update check (excluding pre-releases) - .github/scripts/update-version-file.sh "$(DIST_DIR)" "$(VERSION)" - .PHONY: ci-check ci-check: @.github/scripts/ci-check.sh diff --git a/go.sum b/go.sum index 363585101..8484cf9bd 100644 --- a/go.sum +++ b/go.sum @@ -90,8 +90,6 @@ github.com/anchore/go-version v1.2.2-0.20200701162849-18adb9c92b9b h1:e1bmaoJfZV github.com/anchore/go-version v1.2.2-0.20200701162849-18adb9c92b9b/go.mod h1:Bkc+JYWjMCF8OyZ340IMSIi2Ebf3uwByOk6ho4wne1E= github.com/anchore/packageurl-go v0.1.1-0.20230104203445-02e0a6721501 h1:AV7qjwMcM4r8wFhJq3jLRztew3ywIyPTRapl2T1s9o8= github.com/anchore/packageurl-go v0.1.1-0.20230104203445-02e0a6721501/go.mod h1:Blo6OgJNiYF41ufcgHKkbCKF2MDOMlrqhXv/ij6ocR4= -github.com/anchore/stereoscope v0.0.0-20230216143338-4b5ebf8c7f4b h1:vMEAfz91QLjJq2W8JPxpIC4dG4OeynTY4MisHnZ19F0= -github.com/anchore/stereoscope v0.0.0-20230216143338-4b5ebf8c7f4b/go.mod h1:6oSG43mzahqiktzXZDctqi1o66fwU2wDk3xki0KlnbA= github.com/anchore/stereoscope v0.0.0-20230222185948-fab1c9638abc h1:b+2KauWByrCPLNnzRHjLoUxo85tpszFtU7S1I5pAKK0= github.com/anchore/stereoscope v0.0.0-20230222185948-fab1c9638abc/go.mod h1:Y+jiUa5PmQh9jUvzmvus4EvLnEG87cDTOYgV3nw3wDg= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=