Skip to content

Commit 4fa0f39

Browse files
authored
Revert "[chore] Calculate next release version automatically (#38607)"
This reverts commit 3d652e6.
1 parent dce0082 commit 4fa0f39

File tree

1 file changed

+7
-35
lines changed

1 file changed

+7
-35
lines changed

.github/workflows/prepare-release.yml

+7-35
Original file line numberDiff line numberDiff line change
@@ -6,61 +6,33 @@ on:
66
# the minor version number and set the patch number to 0.
77
inputs:
88
candidate-beta:
9-
type: choice
109
required: true
11-
description: Select what kind of version bump this should be
12-
options:
13-
- minor
14-
- patch
10+
description: Release candidate version (beta, like 0.70.0)
11+
12+
current-beta:
13+
required: true
14+
description: Current version (beta, like 0.69.1)
1515
jobs:
1616
# Releasing opentelemetry-collector-contrib
1717
prepare-release:
1818
runs-on: ubuntu-24.04
1919
steps:
2020
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
2121
with:
22-
fetch-depth: 0
2322
repository: "open-telemetry/opentelemetry-collector"
2423
path: opentelemetry-collector
2524
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
2625
with:
27-
fetch-depth: 0
2826
path: opentelemetry-collector-contrib
2927
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5
3028
with:
3129
go-version: "1.23.7"
3230
cache: false
33-
34-
- name: Get Previous tag
35-
id: previous-version
36-
uses: WyriHaximus/github-action-get-previous-tag@04e8485ecb6487243907e330d522ff60f02283ce # v1.4.0
37-
with:
38-
prefix: v
39-
workingDirectory: opentelemetry-collector-contrib
40-
41-
- name: Get next minor version
42-
id: semvers
43-
uses: WyriHaximus/github-action-next-semvers@18aa9ed4152808ab99b88d71f5481e41f8d89930 # v1.2.1
44-
with:
45-
version: ${{ steps.previous-version.outputs.tag }}
46-
47-
- name: Select next version
48-
id: next-version
49-
run: |
50-
if [[ '${{ inputs.candidate-beta }}' == 'minor' ]]; then
51-
echo "next-version=${{ steps.semvers.outputs.minor }}" >> $GITHUB_OUTPUT
52-
elif [[ '${{ inputs.candidate-beta }}' == 'patch' ]]; then
53-
echo "next-version=${{ steps.semvers.outputs.patch }}" >> $GITHUB_OUTPUT
54-
else
55-
echo "Error: unsupported semver type"
56-
exit 1
57-
fi
58-
5931
- name: Prepare release for contrib
6032
working-directory: opentelemetry-collector-contrib
6133
env:
6234
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
6335
REPO: open-telemetry/opentelemetry-collector-contrib
64-
CANDIDATE_BETA: ${{ steps.next-version.outputs.next-version }}
65-
CURRENT_BETA: ${{ steps.previous-version.outputs.tag }}
36+
CANDIDATE_BETA: ${{ inputs.candidate-beta }}
37+
CURRENT_BETA: ${{ inputs.current-beta }}
6638
run: ./.github/workflows/scripts/release-prepare-release.sh

0 commit comments

Comments
 (0)