Skip to content

Commit 9543523

Browse files
codebotencodeboten
authored
Merge branch 'main' into renovate/github.com-golangci-golangci-lint-2.x
2 parents 279842b + cf49766 commit 9543523

File tree

132 files changed

+798
-258
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+798
-258
lines changed

Diff for: ‎.chloggen/mx-psi_extensionauth-1.0.yaml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: extensionauth
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Mark module as stable
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [11006]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: [api]

Diff for: ‎.github/workflows/prepare-release.yml

+81-46
Original file line numberDiff line numberDiff line change
@@ -6,63 +6,96 @@ on:
66
# the minor version number and set the patch number to 0.
77
inputs:
88
candidate-stable:
9-
description: Release candidate version (stable, like 1.3.0). Don't include a leading `v`.
10-
11-
current-stable:
12-
required: true
13-
description: Current version (stable, like 1.2.0). Don't include a leading `v`.
9+
description: Release candidate version bump (stable).
10+
type: choice
11+
options:
12+
- minor
13+
- patch
14+
- "no bump"
15+
default: minor
1416

1517
candidate-beta:
16-
description: Release candidate version (beta, like 0.96.0). Don't include `v`.
17-
18-
current-beta:
19-
required: true
20-
description: Current version (beta, like 0.95.1). Don't include `v`.
18+
description: Release candidate version bump (beta).
19+
type: choice
20+
options:
21+
- minor
22+
- patch
23+
default: minor
2124

2225
permissions: read-all
2326

2427
jobs:
25-
validate-versions-format:
28+
extract-versions:
29+
outputs:
30+
current-beta: ${{ steps.current-version-core-beta.outputs.tags }}
31+
current-stable: ${{ steps.current-version-core-stable-trimmed.outputs.tag }}
32+
next-beta: ${{ steps.next-versions.outputs.next_beta }}
33+
next-stable: ${{ steps.next-versions.outputs.next_stable }}
2634
runs-on: ubuntu-latest
2735

2836
steps:
29-
- name: Validate version format
30-
shell: bash
37+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
38+
with:
39+
fetch-depth: 0
40+
41+
- name: Get current tag for core beta
42+
id: current-version-core-beta
43+
uses: WyriHaximus/github-action-get-previous-tag@04e8485ecb6487243907e330d522ff60f02283ce # v1.4.0
44+
with:
45+
prefix: v0
46+
47+
- name: Get current tag for core stable
48+
id: current-version-core-stable
49+
uses: WyriHaximus/github-action-get-previous-tag@04e8485ecb6487243907e330d522ff60f02283ce # v1.4.0
50+
with:
51+
prefix: component/v1 # needs to be a tag of a stable component because major tags are not published
52+
53+
- name: Clean up core tag
54+
id: current-version-core-stable-trimmed
3155
run: |
32-
validate_beta_version() {
33-
local regex_pattern_beta='^[0-9]+\.[0-9]+\.[0-9]+$'
34-
if [[ ! "$1" =~ $regex_pattern_beta ]]; then
35-
echo "Invalid $2 version format. For beta, it can be 0.1.0 or higher"
36-
exit 1
37-
fi
38-
}
56+
monorepo_tag=${{ steps.current-version-core-stable.outputs.tag }}
57+
echo "tag=${monorepo_tag#component/}" >> $GITHUB_OUTPUT
3958
40-
validate_stable_version() {
41-
local regex_pattern_stable='^[1-9][0-9]*\.[0-9]+\.[0-9]+$'
42-
if [[ ! "$1" =~ $regex_pattern_stable ]]; then
43-
echo "Invalid stable version format for $2. Major version must be greater than 1."
44-
exit 1
45-
fi
46-
}
59+
- name: Get next versions - beta
60+
id: semvers-beta
61+
uses: WyriHaximus/github-action-next-semvers@18aa9ed4152808ab99b88d71f5481e41f8d89930 # v1.2.1
62+
with:
63+
version: ${{ steps.current-version-core-beta.outputs.tag }}
4764

48-
if [[ ! -z "${{ inputs.candidate-beta }}" ]]; then
49-
validate_beta_version "${{ inputs.candidate-beta }}" "candidate-beta"
50-
fi
51-
validate_beta_version "${{ inputs.current-beta }}" "current-beta"
65+
- name: Get next versions - stable
66+
id: semvers-stable
67+
uses: WyriHaximus/github-action-next-semvers@18aa9ed4152808ab99b88d71f5481e41f8d89930 # v1.2.1
68+
with:
69+
version: ${{ steps.current-version-core-stable-trimmed.outputs.tag }}
5270

53-
if [[ ! -z "${{ inputs.candidate-stable }}" ]]; then
54-
validate_stable_version "${{ inputs.candidate-stable }}" "candidate-stable"
71+
- name: Select next versions
72+
id: next-versions
73+
run: |
74+
# Candidate Beta
75+
if [[ '${{ inputs.candidate-beta }}' == 'minor' ]]; then
76+
echo "next_beta=${{ steps.semvers-beta.outputs.minor }}" >> $GITHUB_OUTPUT
77+
elif [[ '${{ inputs.candidate-beta }}' == 'patch' ]]; then
78+
echo "next_beta=${{ steps.semvers-beta.outputs.patch }}" >> $GITHUB_OUTPUT
79+
elif [[ '${{ inputs.candidate-beta }}' == 'no bump' ]]; then
80+
echo "next_beta=" >> $GITHUB_OUTPUT
81+
else
82+
echo "Error: unsupported semver type for Candidate Beta"
83+
exit 1
5584
fi
56-
validate_stable_version "${{ inputs.current-stable }}" "current-stable"
5785
58-
if [[ -z "${{ inputs.candidate-beta }}" && -z "${{ inputs.candidate-stable }}" ]]; then
59-
echo "Candidate version is not set for beta or stable. Please set a version to proceed."
86+
# Candidate Stable
87+
if [[ '${{ inputs.candidate-stable }}' == 'minor' ]]; then
88+
echo "next_stable=${{ steps.semvers-stable.outputs.minor }}" >> $GITHUB_OUTPUT
89+
elif [[ '${{ inputs.candidate-stable }}' == 'patch' ]]; then
90+
echo "next_stable=${{ steps.semvers-stable.outputs.patch }}" >> $GITHUB_OUTPUT
91+
elif [[ '${{ inputs.candidate-stable }}' == 'no bump' ]]; then
92+
echo "next_stable=" >> $GITHUB_OUTPUT
93+
else
94+
echo "Error: unsupported semver type Candidate Stable"
6095
exit 1
6196
fi
6297
6398
check-blockers:
64-
needs:
65-
- validate-versions-format
6699
runs-on: ubuntu-latest
67100
steps:
68101
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -96,6 +129,7 @@ jobs:
96129
create-release-issue:
97130
needs:
98131
- check-blockers
132+
- extract-versions
99133
runs-on: ubuntu-latest
100134
permissions:
101135
issues: write
@@ -109,17 +143,18 @@ jobs:
109143
- name: Create issue for tracking release
110144
env:
111145
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
112-
CANDIDATE_BETA: ${{ inputs.candidate-beta }}
113-
CANDIDATE_STABLE: ${{ inputs.candidate-stable }}
114-
CURRENT_BETA: ${{ inputs.current-beta }}
115-
CURRENT_STABLE: ${{ inputs.current-stable }}
146+
CANDIDATE_BETA: ${{ needs.extract-versions.outputs.next-beta }}
147+
CANDIDATE_STABLE: ${{ needs.extract-versions.outputs.next-stable }}
148+
CURRENT_BETA: ${{ needs.extract-versions.outputs.current-beta }}
149+
CURRENT_STABLE: ${{ needs.extract-versions.outputs.current-stable }}
116150
REPO: open-telemetry/opentelemetry-collector
117151
run: ./.github/workflows/scripts/release-create-tracking-issue.sh
118152

119153
# Releasing opentelemetry-collector
120154
prepare-release:
121155
needs:
122156
- check-blockers
157+
- extract-versions
123158
runs-on: ubuntu-latest
124159
permissions:
125160
contents: write
@@ -139,8 +174,8 @@ jobs:
139174
env:
140175
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
141176
REPO: open-telemetry/opentelemetry-collector
142-
CANDIDATE_BETA: ${{ inputs.candidate-beta }}
143-
CANDIDATE_STABLE: ${{ inputs.candidate-stable }}
144-
CURRENT_BETA: ${{ inputs.current-beta }}
145-
CURRENT_STABLE: ${{ inputs.current-stable }}
177+
CANDIDATE_BETA: ${{ needs.extract-versions.outputs.next-beta }}
178+
CANDIDATE_STABLE: ${{ needs.extract-versions.outputs.next-stable }}
179+
CURRENT_BETA: ${{ needs.extract-versions.outputs.current-beta }}
180+
CURRENT_STABLE: ${{ needs.extract-versions.outputs.current-stable }}
146181
run: ./.github/workflows/scripts/release-prepare-release.sh

Diff for: ‎.github/workflows/sourcecode-release.yaml

+7-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ jobs:
1414
with:
1515
fetch-depth: 0
1616

17+
# Extract title from latest version title in CHANGELOG.md
18+
- name: Prepare release title
19+
id: release-title
20+
run: |
21+
echo "title=$(grep -A 2 '<!-- next version -->' CHANGELOG.md | awk '/##/{print $2}')" >> $GITHUB_OUTPUT
22+
1723
- name: Prepare release notes
1824
run: |
1925
touch release-notes.md
@@ -32,7 +38,7 @@ jobs:
3238
3339
- name: Create Github Release
3440
run: |
35-
gh release create ${{ github.ref_name }} -t ${{ github.ref_name }} -F release-notes.md
41+
gh release create ${{ github.ref_name }} -t ${{ steps.release-title.outputs.title }} -F release-notes.md
3642
env:
3743
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3844
- uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1

0 commit comments

Comments
 (0)