-
Notifications
You must be signed in to change notification settings - Fork 165
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
introduce chloggen to the -releases repository
- Loading branch information
Showing
10 changed files
with
284 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
# Use this changelog template to create an entry for release notes. | ||
|
||
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' | ||
change_type: | ||
|
||
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) | ||
component: | ||
|
||
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). | ||
note: | ||
|
||
# One or more tracking issues or pull requests related to the change | ||
issues: [] | ||
|
||
# (Optional) One or more lines of additional information to render under the primary note. | ||
# These lines will be padded with 2 spaces and then inserted directly into the document. | ||
# Use pipe (|) for multiline entries. | ||
subtext: | ||
|
||
# Optional: The change log or logs in which this entry should be included. | ||
# e.g. '[user]' or '[user, api]' | ||
# Include 'user' if the change is relevant to end users. | ||
# Include 'api' if there is a change to a library API. | ||
# Default: '[user]' | ||
change_logs: [] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
# The directory that stores individual changelog entries. | ||
# Each entry is stored in a dedicated yaml file. | ||
# - 'chloggen new' will copy the 'template_yaml' to this directory as a new entry file. | ||
# - 'chloggen validate' will validate that all entry files are valid. | ||
# - 'chloggen update' will read and delete all entry files in this directory, and update 'changelog_md'. | ||
# Specify as relative path from root of repo. | ||
# (Optional) Default: .chloggen | ||
entries_dir: .chloggen | ||
|
||
# This file is used as the input for individual changelog entries. | ||
# Specify as relative path from root of repo. | ||
# (Optional) Default: .chloggen/TEMPLATE.yaml | ||
template_yaml: .chloggen/TEMPLATE.yaml | ||
|
||
# The CHANGELOG file or files to which 'chloggen update' will write new entries | ||
# (Optional) Default filename: CHANGELOG.md | ||
change_logs: | ||
user: CHANGELOG.md | ||
|
||
# The default change_log or change_logs to which an entry should be added. | ||
# If 'change_logs' is specified in this file, and no value is specified for 'default_change_logs', | ||
# then 'change_logs' MUST be specified in every entry file. | ||
default_change_logs: [user] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,97 @@ | ||
# This action requires that any PR targeting the main branch should add a | ||
# yaml file to the ./.chloggen/ directory. If a CHANGELOG entry is not required, | ||
# or if performing maintance on the Changelog, add either \"[chore]\" to the title of | ||
# the pull request or add the \"Skip Changelog\" label to disable this action. | ||
|
||
name: changelog | ||
|
||
on: | ||
pull_request: | ||
types: [opened, synchronize, reopened, labeled, unlabeled] | ||
branches: | ||
- main | ||
|
||
env: | ||
# Make sure to exit early if cache segment download times out after 2 minutes. | ||
# We limit cache download as a whole to 5 minutes. | ||
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2 | ||
# renovate: datasource=github-releases depName=tcort/markdown-link-check | ||
MD_LINK_CHECK_VERSION: "3.12.2" | ||
|
||
concurrency: | ||
group: ${{ github.workflow }}-${{ github.head_ref }} | ||
cancel-in-progress: true | ||
|
||
jobs: | ||
changelog: | ||
runs-on: ubuntu-24.04 | ||
if: ${{ github.actor != 'dependabot[bot]' }} | ||
env: | ||
PR_HEAD: ${{ github.event.pull_request.head.sha }} | ||
|
||
steps: | ||
- uses: actions/checkout@v4 | ||
with: | ||
fetch-depth: 0 | ||
- uses: actions/setup-go@v5 | ||
with: | ||
go-version: "1.22.8" | ||
cache: false | ||
- name: Cache Go | ||
id: go-cache | ||
timeout-minutes: 5 | ||
uses: actions/cache@v4 | ||
with: | ||
path: | | ||
~/go/bin | ||
~/go/pkg/mod | ||
key: changelog-${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} | ||
|
||
- name: Ensure no changes to the CHANGELOG.md or CHANGELOG-API.md | ||
if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependencies') && !contains(github.event.pull_request.labels.*.name, 'Skip Changelog') && !contains(github.event.pull_request.title, '[chore]')}} | ||
run: | | ||
if [[ $(git diff --name-only $(git merge-base origin/main $PR_HEAD) $PR_HEAD ./CHANGELOG*.md) ]] | ||
then | ||
echo "CHANGELOG.md and CHANGELOG-API.md should not be directly modified." | ||
echo "Please add a .yaml file to the ./.chloggen/ directory." | ||
echo "See CONTRIBUTING.md for more details." | ||
echo "Alternately, add either \"[chore]\" to the title of the pull request or add the \"Skip Changelog\" label if this job should be skipped." | ||
false | ||
else | ||
echo "CHANGELOG.md and CHANGELOG-API.md were not modified." | ||
fi | ||
- name: Ensure ./.chloggen/*.yaml addition(s) | ||
if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependencies') && !contains(github.event.pull_request.labels.*.name, 'Skip Changelog') && !contains(github.event.pull_request.title, '[chore]')}} | ||
run: | | ||
if [[ 1 -gt $(git diff --diff-filter=A --name-only $(git merge-base origin/main $PR_HEAD) $PR_HEAD ./.chloggen | grep -c \\.yaml) ]] | ||
then | ||
echo "No changelog entry was added to the ./.chloggen/ directory." | ||
echo "Please add a .yaml file to the ./.chloggen/ directory." | ||
echo "See CONTRIBUTING.md for more details." | ||
echo "Alternately, add either \"[chore]\" to the title of the pull request or add the \"Skip Changelog\" label if this job should be skipped." | ||
false | ||
else | ||
echo "A changelog entry was added to the ./.chloggen/ directory." | ||
fi | ||
- name: Validate ./.chloggen/*.yaml changes | ||
run: | | ||
make chlog-validate \ | ||
|| { echo "New ./.chloggen/*.yaml file failed validation."; exit 1; } | ||
# In order to validate any links in the yaml file, render the config to markdown | ||
- name: Render .chloggen changelog entries | ||
if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependencies') && !contains(github.event.pull_request.labels.*.name, 'Skip Changelog') && !contains(github.event.pull_request.title, '[chore]')}} | ||
run: make chlog-preview > changelog_preview.md | ||
- name: Install markdown-link-check | ||
if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependencies') && !contains(github.event.pull_request.labels.*.name, 'Skip Changelog') && !contains(github.event.pull_request.title, '[chore]')}} | ||
run: npm install -g markdown-link-check@${{ env.MD_LINK_CHECK_VERSION }} | ||
- name: Run markdown-link-check | ||
if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependencies') && !contains(github.event.pull_request.labels.*.name, 'Skip Changelog') && !contains(github.event.pull_request.title, '[chore]')}} | ||
run: | | ||
markdown-link-check \ | ||
--verbose \ | ||
--config .github/workflows/check_links_config.json \ | ||
changelog_preview.md \ | ||
|| { echo "Check that anchor links are lowercase"; exit 1; } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
{ | ||
"ignorePatterns": [ | ||
{ | ||
"pattern": "http(s)?://\\d+\\.\\d+\\.\\d+\\.\\d+" | ||
}, | ||
{ | ||
"pattern": "http(s)?://localhost" | ||
}, | ||
{ | ||
"pattern": "http(s)?://example.com" | ||
}, | ||
{ | ||
"pattern": "#warnings" | ||
} | ||
], | ||
"aliveStatusCodes": [429, 200], | ||
"httpHeaders": [ | ||
{ | ||
"urls": ["https://docs.github.com/"], | ||
"headers": { | ||
"Accept-Encoding": "zstd, br, gzip, deflate" | ||
} | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,3 +5,4 @@ dist/ | |
.generated-yaml/ | ||
.vscode | ||
.core | ||
.tools |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,21 @@ | ||
GO ?= go | ||
GORELEASER ?= goreleaser | ||
|
||
# SRC_ROOT is the top of the source tree. | ||
SRC_ROOT := $(shell git rev-parse --show-toplevel) | ||
OTELCOL_BUILDER_VERSION ?= 0.115.0 | ||
OTELCOL_BUILDER_DIR ?= ${HOME}/bin | ||
OTELCOL_BUILDER ?= ${OTELCOL_BUILDER_DIR}/ocb | ||
|
||
GOCMD?= go | ||
TOOLS_MOD_DIR := $(SRC_ROOT)/internal/tools | ||
TOOLS_BIN_DIR := $(SRC_ROOT)/.tools | ||
TOOLS_MOD_REGEX := "\s+_\s+\".*\"" | ||
TOOLS_PKG_NAMES := $(shell grep -E $(TOOLS_MOD_REGEX) < $(TOOLS_MOD_DIR)/tools.go | tr -d " _\"" | grep -vE '/v[0-9]+$$') | ||
TOOLS_BIN_NAMES := $(addprefix $(TOOLS_BIN_DIR)/, $(notdir $(shell echo $(TOOLS_PKG_NAMES)))) | ||
CHLOGGEN := $(TOOLS_BIN_DIR)/chloggen | ||
CHLOGGEN_CONFIG := .chloggen/config.yaml | ||
|
||
DISTRIBUTIONS ?= "otelcol,otelcol-contrib,otelcol-k8s,otelcol-otlp" | ||
|
||
ci: check build | ||
|
@@ -92,4 +103,30 @@ delete-tags: | |
# Used for debug only | ||
REMOTE?[email protected]:open-telemetry/opentelemetry-collector-releases.git | ||
.PHONY: repeat-tags | ||
repeat-tags: delete-tags push-tags | ||
repeat-tags: delete-tags push-tags | ||
|
||
.PHONY: install-tools | ||
install-tools: $(TOOLS_BIN_NAMES) | ||
|
||
$(TOOLS_BIN_DIR): | ||
mkdir -p $@ | ||
|
||
$(TOOLS_BIN_NAMES): $(TOOLS_BIN_DIR) $(TOOLS_MOD_DIR)/go.mod | ||
cd $(TOOLS_MOD_DIR) && $(GOCMD) build -o $@ -trimpath $(filter %/$(notdir $@),$(TOOLS_PKG_NAMES)) | ||
|
||
FILENAME?=$(shell git branch --show-current) | ||
.PHONY: chlog-new | ||
chlog-new: $(CHLOGGEN) | ||
$(CHLOGGEN) new --config $(CHLOGGEN_CONFIG) --filename $(FILENAME) | ||
|
||
.PHONY: chlog-validate | ||
chlog-validate: $(CHLOGGEN) | ||
$(CHLOGGEN) validate --config $(CHLOGGEN_CONFIG) | ||
|
||
.PHONY: chlog-preview | ||
chlog-preview: $(CHLOGGEN) | ||
$(CHLOGGEN) update --config $(CHLOGGEN_CONFIG) --dry | ||
|
||
.PHONY: chlog-update | ||
chlog-update: $(CHLOGGEN) | ||
$(CHLOGGEN) update --config $(CHLOGGEN_CONFIG) --version $(VERSION) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
include ../../Makefile.Common |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
module go.opentelemetry.io/collector/internal/tools | ||
|
||
go 1.23 | ||
|
||
toolchain go1.23.2 | ||
|
||
require go.opentelemetry.io/build-tools/chloggen v0.15.0 | ||
|
||
require ( | ||
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect | ||
github.com/inconshreveable/mousetrap v1.1.0 // indirect | ||
github.com/kr/pretty v0.3.1 // indirect | ||
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect | ||
github.com/rogpeppe/go-internal v1.13.1 // indirect | ||
github.com/spf13/cobra v1.8.1 // indirect | ||
github.com/spf13/pflag v1.0.5 // indirect | ||
github.com/stretchr/testify v1.10.0 // indirect | ||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect | ||
gopkg.in/yaml.v3 v3.0.1 // indirect | ||
) | ||
|
||
retract ( | ||
v0.57.1 // Release failed, use v0.57.2 | ||
v0.57.0 // Release failed, use v0.57.2 | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= | ||
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= | ||
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= | ||
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= | ||
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= | ||
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= | ||
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= | ||
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= | ||
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= | ||
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= | ||
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= | ||
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= | ||
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= | ||
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= | ||
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= | ||
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= | ||
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= | ||
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= | ||
github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= | ||
github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= | ||
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= | ||
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= | ||
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= | ||
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= | ||
go.opentelemetry.io/build-tools/chloggen v0.15.0 h1:G5UeYUgP6x4QXie0yNs/6TjK9nCuuVXgXeDWE9/cxQQ= | ||
go.opentelemetry.io/build-tools/chloggen v0.15.0/go.mod h1:oovDPiOQS4iruTVH469/68hEYjWC48c8u+qJpWJc8Eg= | ||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | ||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= | ||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= | ||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= | ||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
// Copyright The OpenTelemetry Authors | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
//go:build tools | ||
|
||
package tools // import "go.opentelemetry.io/collector/internal/tools" | ||
|
||
// This file follows the recommendation at | ||
// https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module | ||
// on how to pin tooling dependencies to a go.mod file. | ||
// This ensures that all systems use the same version of tools in addition to regular dependencies. | ||
|
||
import ( | ||
_ "go.opentelemetry.io/build-tools/chloggen" | ||
) |