diff --git a/.github/workflows/base-ci-goreleaser.yaml b/.github/workflows/base-ci-goreleaser.yaml index d954083b..ba30186d 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 @@ -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 1a8e0786..03e2506a 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 @@ -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: @@ -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 }} @@ -114,7 +115,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 @@ -122,7 +123,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: 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 diff --git a/distributions/otelcol-contrib/manifest.yaml b/distributions/otelcol-contrib/manifest.yaml index 3333e01b..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 @@ -224,7 +223,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 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=