From 16ccd56cad06681c548dc195b7dabf9c140d928f Mon Sep 17 00:00:00 2001 From: Andrzej Stencel Date: Mon, 7 Oct 2024 11:18:33 +0200 Subject: [PATCH 1/7] [chore] refactor(contrib): remove replace directive for `go-ieproxy` package (#678) The replacement for the package `github.com/mattn/go-ieproxy` is currently in effect and replaces `v0.0.11` of the package with version `v0.0.1`. I believe this replacement is not necessary anymore, as the issue https://github.com/mattn/go-ieproxy/issues/45 was fixed https://github.com/mattn/go-ieproxy/pull/47 in v0.0.11. Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- distributions/otelcol-contrib/manifest.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/distributions/otelcol-contrib/manifest.yaml b/distributions/otelcol-contrib/manifest.yaml index 3333e01b..d01a3a0b 100644 --- a/distributions/otelcol-contrib/manifest.yaml +++ b/distributions/otelcol-contrib/manifest.yaml @@ -224,7 +224,5 @@ providers: # When adding a replace, add a comment before it to document why it's needed and when it can be removed replaces: - # see https://github.com/mattn/go-ieproxy/issues/45 - - github.com/mattn/go-ieproxy => github.com/mattn/go-ieproxy v0.0.1 # see https://github.com/openshift/api/pull/1515 - github.com/openshift/api => github.com/openshift/api v0.0.0-20230726162818-81f778f3b3ec From 7c1c3a96e0712da87a11fe6caf29056c8f8f91fb Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Tue, 8 Oct 2024 10:20:58 -0700 Subject: [PATCH 2/7] remove unmaintained component (#686) This component has been unmaintained for 6 months, removing as per the policy. Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- distributions/otelcol-contrib/manifest.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/distributions/otelcol-contrib/manifest.yaml b/distributions/otelcol-contrib/manifest.yaml index d01a3a0b..cfb6bfc3 100644 --- a/distributions/otelcol-contrib/manifest.yaml +++ b/distributions/otelcol-contrib/manifest.yaml @@ -142,7 +142,6 @@ receivers: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.111.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/githubreceiver v0.111.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver v0.111.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver v0.111.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/haproxyreceiver v0.111.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.111.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver v0.111.0 From adc2e29367182be5ba362cae9f6410ff505952dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 10:54:48 -0700 Subject: [PATCH 3/7] Bump sigstore/cosign-installer from 3.6.0 to 3.7.0 (#691) Bumps [sigstore/cosign-installer](https://github.com/sigstore/cosign-installer) from 3.6.0 to 3.7.0. - [Release notes](https://github.com/sigstore/cosign-installer/releases) - [Commits](https://github.com/sigstore/cosign-installer/compare/4959ce089c160fddf62f7b42464195ba1a56d382...dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da) --- updated-dependencies: - dependency-name: sigstore/cosign-installer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .github/workflows/base-release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/base-release.yaml b/.github/workflows/base-release.yaml index 1a8e0786..60e0b728 100644 --- a/.github/workflows/base-release.yaml +++ b/.github/workflows/base-release.yaml @@ -39,7 +39,7 @@ jobs: with: fetch-depth: 0 - - uses: sigstore/cosign-installer@4959ce089c160fddf62f7b42464195ba1a56d382 # v3.6.0 + - uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da # v3.7.0 - uses: anchore/sbom-action/download-syft@61119d458adab75f756bc0b9e4bde25725f86a7a # v0.17.2 @@ -114,7 +114,7 @@ jobs: with: fetch-depth: 0 - - uses: sigstore/cosign-installer@4959ce089c160fddf62f7b42464195ba1a56d382 # v3.6.0 + - uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da # v3.7.0 - uses: anchore/sbom-action/download-syft@61119d458adab75f756bc0b9e4bde25725f86a7a # v0.17.2 From 7a0e2c0d9e8fd459fd2fc1e72380dd2d04164af3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 11:13:31 -0700 Subject: [PATCH 4/7] Bump docker/setup-buildx-action from 3.6.1 to 3.7.1 (#690) Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3.6.1 to 3.7.1. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/988b5a0280414f521da01fcc63a27aeeb4b104db...c47758b77c9736f4b2ef4073d4d51994fabfe349) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .github/workflows/base-ci-goreleaser.yaml | 2 +- .github/workflows/base-release.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/base-ci-goreleaser.yaml b/.github/workflows/base-ci-goreleaser.yaml index d954083b..5790efaf 100644 --- a/.github/workflows/base-ci-goreleaser.yaml +++ b/.github/workflows/base-ci-goreleaser.yaml @@ -52,7 +52,7 @@ jobs: sudo apt-get install -y wixl - name: Setup Docker Buildx - uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1 + uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1 - name: Setup Go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 diff --git a/.github/workflows/base-release.yaml b/.github/workflows/base-release.yaml index 60e0b728..be351240 100644 --- a/.github/workflows/base-release.yaml +++ b/.github/workflows/base-release.yaml @@ -47,7 +47,7 @@ jobs: with: platforms: arm64,ppc64le,linux/arm/v7,s390x - - uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1 + - uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: @@ -122,7 +122,7 @@ jobs: with: platforms: arm64,ppc64le,s390x - - uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1 + - uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: From 1d10b81ed3dbe155e928e157cfbcdc0bc407e929 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2024 11:31:21 -0400 Subject: [PATCH 5/7] Bump github.com/goreleaser/goreleaser-pro/v2 from 2.2.0-pro to 2.3.2-pro (#672) Bumps [github.com/goreleaser/goreleaser-pro/v2](https://github.com/goreleaser/goreleaser-pro) from 2.2.0-pro to 2.3.2-pro. - [Release notes](https://github.com/goreleaser/goreleaser-pro/releases) - [Commits](https://github.com/goreleaser/goreleaser-pro/compare/v2.2.0-pro...v2.3.2-pro) --- updated-dependencies: - dependency-name: github.com/goreleaser/goreleaser-pro/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> Co-authored-by: Pablo Baeyens --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7d9fa9ce..31fe5108 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-releases go 1.23 require ( - github.com/goreleaser/goreleaser-pro/v2 v2.2.0-pro + github.com/goreleaser/goreleaser-pro/v2 v2.3.2-pro gopkg.in/yaml.v3 v3.0.1 ) diff --git a/go.sum b/go.sum index a6767905..e823cbd7 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,6 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/goreleaser/goreleaser-pro/v2 v2.2.0-pro h1:F211wEC/xkWUQ90KpaOdm6lx+RoqWXpyI1WwzpdAYPw= -github.com/goreleaser/goreleaser-pro/v2 v2.2.0-pro/go.mod h1:GA7Uzk7qKA3efeDmgfWwcMTrDJe+V7D6H5RMqXlFvuc= +github.com/goreleaser/goreleaser-pro/v2 v2.3.2-pro h1:9zJQ9cxvLn0JJZsjomtjOnSB9W4nrpFazZ7KxDZmuoU= +github.com/goreleaser/goreleaser-pro/v2 v2.3.2-pro/go.mod h1:GA7Uzk7qKA3efeDmgfWwcMTrDJe+V7D6H5RMqXlFvuc= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= From d745106e8ddf096a9afed7f228fdbd567d5b4167 Mon Sep 17 00:00:00 2001 From: Jade Guiton Date: Thu, 10 Oct 2024 11:40:02 -0400 Subject: [PATCH 6/7] [chore] Update goreleaser used in CI to v2.3.2 (#689) * [chore] Update goreleaser version used in CI * Always specify GOARM parameter in CI It should simply get ignored when GOARCH is not "arm". --------- Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com> Co-authored-by: Pablo Baeyens --- .github/workflows/base-ci-goreleaser.yaml | 6 ++++-- .github/workflows/base-release.yaml | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/base-ci-goreleaser.yaml b/.github/workflows/base-ci-goreleaser.yaml index 5790efaf..ba30186d 100644 --- a/.github/workflows/base-ci-goreleaser.yaml +++ b/.github/workflows/base-ci-goreleaser.yaml @@ -67,12 +67,13 @@ jobs: uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6.0.0 with: distribution: goreleaser-pro - version: v2.2.0 + version: v2.3.2 workdir: distributions/${{ inputs.distribution }} args: --snapshot --clean --skip=sign,sbom --timeout 2h --split env: GOOS: ${{ matrix.GOOS }} GOARCH: ${{ matrix.GOARCH }} + GOARM: 7 # Default is 6 GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} - name: Upload linux service packages @@ -80,4 +81,5 @@ jobs: uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0 with: name: linux-packages - path: distributions/${{ inputs.distribution }}/dist/linux_amd64/* + path: distributions/${{ inputs.distribution }}/dist/linux_amd64_v1/* + if-no-files-found: error diff --git a/.github/workflows/base-release.yaml b/.github/workflows/base-release.yaml index be351240..03e2506a 100644 --- a/.github/workflows/base-release.yaml +++ b/.github/workflows/base-release.yaml @@ -83,12 +83,13 @@ jobs: - uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6.0.0 with: distribution: goreleaser-pro - version: v2.2.0 + version: v2.3.2 workdir: distributions/${{ inputs.distribution }} args: release --clean --split --timeout 2h --release-header-tmpl=../../.github/release-template.md env: GOOS: ${{ matrix.GOOS }} GOARCH: ${{ matrix.GOARCH }} + GOARM: 7 # Default is 6 GITHUB_TOKEN: ${{ secrets.GH_PAT }} COSIGN_YES: true GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} From 3b59b8c54de6ae9a760986d2781023c502d855db Mon Sep 17 00:00:00 2001 From: Mercy Bassey <57226464+mercybassey@users.noreply.github.com> Date: Fri, 11 Oct 2024 14:58:27 +0100 Subject: [PATCH 7/7] Added a step to tidy go.mod files (#687) Co-authored-by: Pablo Baeyens --- .github/workflows/ci.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index befd39bc..885baca3 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -22,5 +22,8 @@ jobs: go-version: '1.23' check-latest: true + - name: Tidy go.mod files + run: go mod tidy + - name: Verify run: make ci