From ace7c2a3b6239aca4285578acb83ae526837f382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juraci=20Paix=C3=A3o=20Kr=C3=B6hling?= Date: Thu, 25 Nov 2021 20:40:54 +0100 Subject: [PATCH] Small adjustments to the release config and docs (#4487) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Juraci Paixão Kröhling --- .github/workflows/builder-release.yaml | 2 +- cmd/builder/.goreleaser.yml | 5 +++++ docs/release.md | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/builder-release.yaml b/.github/workflows/builder-release.yaml index 3f1faf0af05..48c7c3fdaa7 100644 --- a/.github/workflows/builder-release.yaml +++ b/.github/workflows/builder-release.yaml @@ -25,7 +25,7 @@ jobs: with: distribution: goreleaser-pro version: latest - args: release --rm-dist + args: release --rm-dist -f cmd/builder/.goreleaser.yml env: GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/cmd/builder/.goreleaser.yml b/cmd/builder/.goreleaser.yml index 89984f02cd4..f555f592e24 100644 --- a/cmd/builder/.goreleaser.yml +++ b/cmd/builder/.goreleaser.yml @@ -22,6 +22,11 @@ builds: goarm: - 6 - 7 + binary: ocb +release: + github: + owner: open-telemetry + name: opentelemetry-collector archives: - format: binary checksum: diff --git a/docs/release.md b/docs/release.md index bd85b677e32..61e3c4d7173 100644 --- a/docs/release.md +++ b/docs/release.md @@ -31,7 +31,9 @@ We release both core and contrib collectors with the same versions where the con 1. Tag all the modules with the new release version by running the `make add-tag` command (e.g. `make add-tag TAG=v0.4.0`). Push them to origin (not your fork) with `git push --tags origin` (assuming origin refers to upstream open-telemetry project). Wait for the new tag build to pass successfully. -1. The release script for the collector builder should create a new GitHub release. Wait until the workflow "Builder - Release" has completed and change the release's description to include the release notes from the CHANGELOG.md file. +1. The release script for the collector builder should create a new GitHub release for the builder. This is a separate release from the core, but we might join them in the future if it makes sense. + +1. Create a new `v0.40.0` release and use the contents from the CHANGELOG.md as the release's description. ## Releasing opentelemetry-collector-contrib