Fix goreleaser ci jackgopack4

.goreleaser.yaml

@@ -1,4 +1,6 @@
 version: 2
+monorepo:
+  tag_prefix: v
 release:
   header: |
     Check the [v{{.Version}} contrib changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tags/v{{.Version}}) and the [v{{.Version}} core changelog](https://github.com/open-telemetry/opentelemetry-collector/releases/tags/v{{.Version}}) for changelogs on specific components.

Makefile

@@ -8,7 +8,7 @@ OTELCOL_BUILDER ?= ${OTELCOL_BUILDER_DIR}/ocb
 DISTRIBUTIONS ?= "otelcol,otelcol-contrib,otelcol-k8s"
 GEN_CONFIG_DISTRIBUTIONS ?= "otelcol,otelcol-contrib"
 
-ci: check build
+ci: build
 check: ensure-goreleaser-up-to-date
 
 build: go ocb
@@ -65,7 +65,7 @@ goreleaser:
 		fi \
 	}
 
-REMOTE?=git@github.com:open-telemetry/opentelemetry-collector-releases.git
+REMOTE?=git@github.com:jackgopack4/opentelemetry-collector-releases.git
 .PHONY: push-tags
 push-tags:
 	@[ "${TAG}" ] || ( echo ">> env var TAG is not set"; exit 1 )

README.md

@@ -12,7 +12,7 @@ Each distribution contains:
 
 More details about each individual distribution can be seen in its own readme files.
 
-Current list of distributions:
+Current list of distributions: 
 
 - [OpenTelemetry Collector (also known as "otelcol")](./distributions/otelcol)
 - [OpenTelemetry Collector Contrib (also known as "otelcol-contrib")](./distributions/otelcol-contrib)

distributions/otelcol-contrib/.goreleaser.yaml

@@ -1,6 +1,8 @@
 partial:
   by: target
 version: 2
+monorepo:
+  tag_prefix: v
 project_name: opentelemetry-collector-releases
 env:
   - COSIGN_YES=true
@@ -84,161 +86,161 @@ nfpms:
     license: Apache 2.0
 checksum:
   name_template: '{{ .ProjectName }}_otelcol-contrib_checksums.txt'
-dockers:
-  - goos: linux
-    goarch: "386"
-    dockerfile: Dockerfile
-    image_templates:
-      - otel/opentelemetry-collector-contrib:{{ .Version }}-386
-      - otel/opentelemetry-collector-contrib:latest-386
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-386
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-386
-    extra_files:
-      - config.yaml
-    build_flag_templates:
-      - --pull
-      - --platform=linux/386
-      - --label=org.opencontainers.image.created={{.Date}}
-      - --label=org.opencontainers.image.name={{.ProjectName}}
-      - --label=org.opencontainers.image.revision={{.FullCommit}}
-      - --label=org.opencontainers.image.version={{.Version}}
-      - --label=org.opencontainers.image.source={{.GitURL}}
-      - --label=org.opencontainers.image.licenses=Apache-2.0
-    use: buildx
-  - goos: linux
-    goarch: amd64
-    dockerfile: Dockerfile
-    image_templates:
-      - otel/opentelemetry-collector-contrib:{{ .Version }}-amd64
-      - otel/opentelemetry-collector-contrib:latest-amd64
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-amd64
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-amd64
-    extra_files:
-      - config.yaml
-    build_flag_templates:
-      - --pull
-      - --platform=linux/amd64
-      - --label=org.opencontainers.image.created={{.Date}}
-      - --label=org.opencontainers.image.name={{.ProjectName}}
-      - --label=org.opencontainers.image.revision={{.FullCommit}}
-      - --label=org.opencontainers.image.version={{.Version}}
-      - --label=org.opencontainers.image.source={{.GitURL}}
-      - --label=org.opencontainers.image.licenses=Apache-2.0
-    use: buildx
-  - goos: linux
-    goarch: arm
-    goarm: "7"
-    dockerfile: Dockerfile
-    image_templates:
-      - otel/opentelemetry-collector-contrib:{{ .Version }}-armv7
-      - otel/opentelemetry-collector-contrib:latest-armv7
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-armv7
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-armv7
-    extra_files:
-      - config.yaml
-    build_flag_templates:
-      - --pull
-      - --platform=linux/arm/v7
-      - --label=org.opencontainers.image.created={{.Date}}
-      - --label=org.opencontainers.image.name={{.ProjectName}}
-      - --label=org.opencontainers.image.revision={{.FullCommit}}
-      - --label=org.opencontainers.image.version={{.Version}}
-      - --label=org.opencontainers.image.source={{.GitURL}}
-      - --label=org.opencontainers.image.licenses=Apache-2.0
-    use: buildx
-  - goos: linux
-    goarch: arm64
-    dockerfile: Dockerfile
-    image_templates:
-      - otel/opentelemetry-collector-contrib:{{ .Version }}-arm64
-      - otel/opentelemetry-collector-contrib:latest-arm64
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-arm64
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-arm64
-    extra_files:
-      - config.yaml
-    build_flag_templates:
-      - --pull
-      - --platform=linux/arm64
-      - --label=org.opencontainers.image.created={{.Date}}
-      - --label=org.opencontainers.image.name={{.ProjectName}}
-      - --label=org.opencontainers.image.revision={{.FullCommit}}
-      - --label=org.opencontainers.image.version={{.Version}}
-      - --label=org.opencontainers.image.source={{.GitURL}}
-      - --label=org.opencontainers.image.licenses=Apache-2.0
-    use: buildx
-  - goos: linux
-    goarch: ppc64le
-    dockerfile: Dockerfile
-    image_templates:
-      - otel/opentelemetry-collector-contrib:{{ .Version }}-ppc64le
-      - otel/opentelemetry-collector-contrib:latest-ppc64le
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-ppc64le
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-ppc64le
-    extra_files:
-      - config.yaml
-    build_flag_templates:
-      - --pull
-      - --platform=linux/ppc64le
-      - --label=org.opencontainers.image.created={{.Date}}
-      - --label=org.opencontainers.image.name={{.ProjectName}}
-      - --label=org.opencontainers.image.revision={{.FullCommit}}
-      - --label=org.opencontainers.image.version={{.Version}}
-      - --label=org.opencontainers.image.source={{.GitURL}}
-      - --label=org.opencontainers.image.licenses=Apache-2.0
-    use: buildx
-  - goos: linux
-    goarch: s390x
-    dockerfile: Dockerfile
-    image_templates:
-      - otel/opentelemetry-collector-contrib:{{ .Version }}-s390x
-      - otel/opentelemetry-collector-contrib:latest-s390x
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-s390x
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-s390x
-    extra_files:
-      - config.yaml
-    build_flag_templates:
-      - --pull
-      - --platform=linux/s390x
-      - --label=org.opencontainers.image.created={{.Date}}
-      - --label=org.opencontainers.image.name={{.ProjectName}}
-      - --label=org.opencontainers.image.revision={{.FullCommit}}
-      - --label=org.opencontainers.image.version={{.Version}}
-      - --label=org.opencontainers.image.source={{.GitURL}}
-      - --label=org.opencontainers.image.licenses=Apache-2.0
-    use: buildx
-docker_manifests:
-  - name_template: otel/opentelemetry-collector-contrib:{{ .Version }}
-    image_templates:
-      - otel/opentelemetry-collector-contrib:{{ .Version }}-386
-      - otel/opentelemetry-collector-contrib:{{ .Version }}-amd64
-      - otel/opentelemetry-collector-contrib:{{ .Version }}-armv7
-      - otel/opentelemetry-collector-contrib:{{ .Version }}-arm64
-      - otel/opentelemetry-collector-contrib:{{ .Version }}-ppc64le
-      - otel/opentelemetry-collector-contrib:{{ .Version }}-s390x
-  - name_template: otel/opentelemetry-collector-contrib:latest
-    image_templates:
-      - otel/opentelemetry-collector-contrib:latest-386
-      - otel/opentelemetry-collector-contrib:latest-amd64
-      - otel/opentelemetry-collector-contrib:latest-armv7
-      - otel/opentelemetry-collector-contrib:latest-arm64
-      - otel/opentelemetry-collector-contrib:latest-ppc64le
-      - otel/opentelemetry-collector-contrib:latest-s390x
-  - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}
-    image_templates:
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-386
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-amd64
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-armv7
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-arm64
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-ppc64le
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-s390x
-  - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest
-    image_templates:
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-386
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-amd64
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-armv7
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-arm64
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-ppc64le
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-s390x
+# dockers:
+#   - goos: linux
+#     goarch: "386"
+#     dockerfile: Dockerfile
+#     image_templates:
+#       - otel/opentelemetry-collector-contrib:{{ .Version }}-386
+#       - otel/opentelemetry-collector-contrib:latest-386
+#       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-386
+#       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-386
+#     extra_files:
+#       - config.yaml
+#     build_flag_templates:
+#       - --pull
+#       - --platform=linux/386
+#       - --label=org.opencontainers.image.created={{.Date}}
+#       - --label=org.opencontainers.image.name={{.ProjectName}}
+#       - --label=org.opencontainers.image.revision={{.FullCommit}}
+#       - --label=org.opencontainers.image.version={{.Version}}
+#       - --label=org.opencontainers.image.source={{.GitURL}}
+#       - --label=org.opencontainers.image.licenses=Apache-2.0
+#     use: buildx
+#   - goos: linux
+#     goarch: amd64
+#     dockerfile: Dockerfile
+#     image_templates:
+#       - otel/opentelemetry-collector-contrib:{{ .Version }}-amd64
+#       - otel/opentelemetry-collector-contrib:latest-amd64
+#       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-amd64
+#       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-amd64
+#     extra_files:
+#       - config.yaml
+#     build_flag_templates:
+#       - --pull
+#       - --platform=linux/amd64
+#       - --label=org.opencontainers.image.created={{.Date}}
+#       - --label=org.opencontainers.image.name={{.ProjectName}}
+#       - --label=org.opencontainers.image.revision={{.FullCommit}}
+#       - --label=org.opencontainers.image.version={{.Version}}
+#       - --label=org.opencontainers.image.source={{.GitURL}}
+#       - --label=org.opencontainers.image.licenses=Apache-2.0
+#     use: buildx
+#   - goos: linux
+#     goarch: arm
+#     goarm: "7"
+#     dockerfile: Dockerfile
+#     image_templates:
+#       - otel/opentelemetry-collector-contrib:{{ .Version }}-armv7
+#       - otel/opentelemetry-collector-contrib:latest-armv7
+#       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-armv7
+#       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-armv7
+#     extra_files:
+#       - config.yaml
+#     build_flag_templates:
+#       - --pull
+#       - --platform=linux/arm/v7
+#       - --label=org.opencontainers.image.created={{.Date}}
+#       - --label=org.opencontainers.image.name={{.ProjectName}}
+#       - --label=org.opencontainers.image.revision={{.FullCommit}}
+#       - --label=org.opencontainers.image.version={{.Version}}
+#       - --label=org.opencontainers.image.source={{.GitURL}}
+#       - --label=org.opencontainers.image.licenses=Apache-2.0
+#     use: buildx
+#   - goos: linux
+#     goarch: arm64
+#     dockerfile: Dockerfile
+#     image_templates:
+#       - otel/opentelemetry-collector-contrib:{{ .Version }}-arm64
+#       - otel/opentelemetry-collector-contrib:latest-arm64
+#       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-arm64
+#       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-arm64
+#     extra_files:
+#       - config.yaml
+#     build_flag_templates:
+#       - --pull
+#       - --platform=linux/arm64
+#       - --label=org.opencontainers.image.created={{.Date}}
+#       - --label=org.opencontainers.image.name={{.ProjectName}}
+#       - --label=org.opencontainers.image.revision={{.FullCommit}}
+#       - --label=org.opencontainers.image.version={{.Version}}
+#       - --label=org.opencontainers.image.source={{.GitURL}}
+#       - --label=org.opencontainers.image.licenses=Apache-2.0
+#     use: buildx
+#   - goos: linux
+#     goarch: ppc64le
+#     dockerfile: Dockerfile
+#     image_templates:
+#       - otel/opentelemetry-collector-contrib:{{ .Version }}-ppc64le
+#       - otel/opentelemetry-collector-contrib:latest-ppc64le
+#       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-ppc64le
+#       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-ppc64le
+#     extra_files:
+#       - config.yaml
+#     build_flag_templates:
+#       - --pull
+#       - --platform=linux/ppc64le
+#       - --label=org.opencontainers.image.created={{.Date}}
+#       - --label=org.opencontainers.image.name={{.ProjectName}}
+#       - --label=org.opencontainers.image.revision={{.FullCommit}}
+#       - --label=org.opencontainers.image.version={{.Version}}
+#       - --label=org.opencontainers.image.source={{.GitURL}}
+#       - --label=org.opencontainers.image.licenses=Apache-2.0
+#     use: buildx
+#   - goos: linux
+#     goarch: s390x
+#     dockerfile: Dockerfile
+#     image_templates:
+#       - otel/opentelemetry-collector-contrib:{{ .Version }}-s390x
+#       - otel/opentelemetry-collector-contrib:latest-s390x
+#       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-s390x
+#       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-s390x
+#     extra_files:
+#       - config.yaml
+#     build_flag_templates:
+#       - --pull
+#       - --platform=linux/s390x
+#       - --label=org.opencontainers.image.created={{.Date}}
+#       - --label=org.opencontainers.image.name={{.ProjectName}}
+#       - --label=org.opencontainers.image.revision={{.FullCommit}}
+#       - --label=org.opencontainers.image.version={{.Version}}
+#       - --label=org.opencontainers.image.source={{.GitURL}}
+#       - --label=org.opencontainers.image.licenses=Apache-2.0
+#     use: buildx
+# docker_manifests:
+#   - name_template: otel/opentelemetry-collector-contrib:{{ .Version }}
+#     image_templates:
+#       - otel/opentelemetry-collector-contrib:{{ .Version }}-386
+#       - otel/opentelemetry-collector-contrib:{{ .Version }}-amd64
+#       - otel/opentelemetry-collector-contrib:{{ .Version }}-armv7
+#       - otel/opentelemetry-collector-contrib:{{ .Version }}-arm64
+#       - otel/opentelemetry-collector-contrib:{{ .Version }}-ppc64le
+#       - otel/opentelemetry-collector-contrib:{{ .Version }}-s390x
+#   - name_template: otel/opentelemetry-collector-contrib:latest
+#     image_templates:
+#       - otel/opentelemetry-collector-contrib:latest-386
+#       - otel/opentelemetry-collector-contrib:latest-amd64
+#       - otel/opentelemetry-collector-contrib:latest-armv7
+#       - otel/opentelemetry-collector-contrib:latest-arm64
+#       - otel/opentelemetry-collector-contrib:latest-ppc64le
+#       - otel/opentelemetry-collector-contrib:latest-s390x
+#   - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}
+#     image_templates:
+#       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-386
+#       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-amd64
+#       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-armv7
+#       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-arm64
+#       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-ppc64le
+#       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-s390x
+#   - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest
+#     image_templates:
+#       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-386
+#       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-amd64
+#       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-armv7
+#       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-arm64
+#       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-ppc64le
+#       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-s390x
 signs:
   - cmd: cosign
     args:
@@ -251,11 +253,11 @@ signs:
     signature: ${artifact}.sig
     artifacts: all
     certificate: ${artifact}.pem
-docker_signs:
-  - args:
-      - sign
-      - ${artifact}
-    artifacts: all
+# docker_signs:
+#   - args:
+#       - sign
+#       - ${artifact}
+#     artifacts: all
 sboms:
   - id: archive
     artifacts: archive