Fix prepare release workflow more (#5865)

* Fix prepare release workflow more

* and more

* more

* more
This commit is contained in:
Trask Stalnaker 2022-04-18 13:29:11 -07:00 committed by GitHub
parent a822e6b2d9
commit 0c26464235
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 42 additions and 35 deletions

View File

@ -1,6 +1,6 @@
#!/bin/bash -e
version=$(grep -Eo "[0-9]+.[0-9]+.0" version.gradle.kts | head -1)
version=$(grep -Eo "[0-9]+.[0-9]+.0" version.gradle.kts)
if [[ $version =~ ([0-9]+).([0-9]+).0 ]]; then
major="${BASH_REMATCH[1]}"
@ -12,7 +12,7 @@ fi
if [[ $minor == 0 ]]; then
prior_major=$((major - 1))
prior_minor=$(grep -Po "^## Version $prior_major.\K([0-9]+)" CHANGELOG.md | head -1)
prior_minor=$(grep -Po "^## Version $prior_major.\K([0-9]+)" CHANGELOG.md | head -1)
prior_version="$prior_major.$prior_minor"
else
prior_version="$major.$((minor - 1)).0"

26
.github/scripts/update-version.sh vendored Executable file
View File

@ -0,0 +1,26 @@
#!/bin/bash
# Bumps versions in these files
# - version.gradle.kts
# - examples/distro/build.gradle
# - examples/extension/build.gradle
new_version=$1
new_alpha_version=$2
if [[ $new_version == *-SNAPSHOT ]]; then
sed -ri "s/val snapshot = .*/val snapshot = true/" version.gradle.kts
else
sed -ri "s/val snapshot = .*/val snapshot = false/" version.gradle.kts
fi
sed -ri "s/[0-9]*\.[0-9]*\.[0-9]*/$new_version/" version.gradle.kts
sed -ri "s/(opentelemetryJavaagent *: )\"[^\"]*\"/\1\"$new_version\"/" examples/distro/build.gradle
sed -ri "s/(opentelemetryJavaagentAlpha *: )\"[^\"]*\"/\1\"$new_alpha_version\"/" examples/distro/build.gradle
sed -ri "s/(opentelemetryJavaagent *: )\"[^\"]*\"/\1\"$new_version\"/" examples/extension/build.gradle
sed -ri "s/(opentelemetryJavaagentAlpha *: )\"[^\"]*\"/\1\"$new_alpha_version\"/" examples/extension/build.gradle
sed -ri "s/(io.opentelemetry.instrumentation.muzzle-generation\" version )\"[^\"]*\"/\1\"$new_alpha_version\"/" examples/extension/build.gradle
sed -ri "s/(io.opentelemetry.instrumentation.muzzle-check\" version )\"[^\"]*\"/\1\"$new_alpha_version\"/" examples/extension/build.gradle

View File

@ -1,24 +0,0 @@
#!/bin/bash
# Bumps versions in these files
# - version.gradle.kts
# - examples/distro/build.gradle
# - examples/extension/build.gradle
current_version=$1
current_alpha_version=$2
new_version=$3
new_alpha_version=$4
echo "updating from $current_version to $new_version and from $current_alpha_version to $new_alpha_version"
sed -ri "s/$current_version/$new_version/" version.gradle.kts
sed -ri "s/(opentelemetryJavaagent *: \")$current_version/\1$new_version/" examples/distro/build.gradle
sed -ri "s/(opentelemetryJavaagentAlpha *: \")$current_alpha_version/\1$new_alpha_version/" examples/distro/build.gradle
sed -ri "s/(opentelemetryJavaagent *: \")$current_version/\1$new_version/" examples/extension/build.gradle
sed -ri "s/(opentelemetryJavaagentAlpha *: \")$current_alpha_version/\1$new_alpha_version/" examples/extension/build.gradle
sed -ri "s/(io.opentelemetry.instrumentation.muzzle-generation\" version \")$current_alpha_version/\1$new_alpha_version/" examples/extension/build.gradle
sed -ri "s/(io.opentelemetry.instrumentation.muzzle-check\" version \")$current_alpha_version/\1$new_alpha_version/" examples/extension/build.gradle

View File

@ -10,7 +10,7 @@ jobs:
- name: Set environment variables
run: |
prior_version=$(grep -Eo "[0-9]+.[0-9]+.[0-9]+" version.gradle.kts | head -1)
prior_version=$(grep -Eo "[0-9]+.[0-9]+.[0-9]+" version.gradle.kts)
if [[ $prior_version =~ ([0-9]+.[0-9]+).([0-9]+) ]]; then
major_minor="${BASH_REMATCH[1]}"
patch="${BASH_REMATCH[2]}"
@ -19,15 +19,14 @@ jobs:
exit 1
fi
echo "VERSION=$major_minor.$((patch + 1))" >> $GITHUB_ENV
echo "PRIOR_VERSION=$prior_version" >> $GITHUB_ENV
- name: Bump version
run: |
.github/scripts/update-versions.sh "$PRIOR_VERSION" "$PRIOR_VERSION-alpha" "$VERSION" "$VERSION-alpha"
.github/scripts/update-version.sh "$VERSION" "$VERSION-alpha"
- name: Bump download link version
run: |
sed -Ei "s,https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v$PRIOR_VERSION/,https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v$VERSION/," README.md
sed -Ei "s,https://github\.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v[0-9]+\.[0-9]+\.[0-9]+/,https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v$VERSION/," README.md
- name: Set git user
run: |

View File

@ -21,7 +21,13 @@ jobs:
- name: Drop snapshot from version
run: |
sed -ri "s/val snapshot = true/val snapshot = false/" version.gradle.kts
version=$(grep -Eo "[0-9]+.[0-9]+.0" version.gradle.kts)
.github/scripts/update-version.sh "$version" "$version-alpha"
- name: Bump download link version
run: |
version=$(grep -Eo "[0-9]+.[0-9]+.0" version.gradle.kts)
sed -Ei "s,https://github\.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/,https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v$version/," README.md
- name: Set git user
run: |
@ -47,7 +53,7 @@ jobs:
- name: Bump snapshot version
run: |
version=$(grep -Eo "[0-9]+.[0-9]+.0-SNAPSHOT" version.gradle.kts | sed 's/-SNAPSHOT//')
version=$(grep -Eo "[0-9]+.[0-9]+.0" version.gradle.kts)
if [[ $version =~ ([0-9]+).([0-9]+).0 ]]; then
major="${BASH_REMATCH[1]}"
minor="${BASH_REMATCH[2]}"
@ -56,7 +62,7 @@ jobs:
exit 1
fi
next_version="$major.$((minor + 1)).0"
sed -ri "s/$version-SNAPSHOT/$next_version-SNAPSHOT/" version.gradle.kts
.github/scripts/update-version.sh "$next_version-SNAPSHOT" "$next_version-alpha-SNAPSHOT"
- name: Set git user
run: |

View File

@ -73,7 +73,7 @@ jobs:
- name: Set environment variables
run: |
version=$(grep -Eo "[0-9]+.[0-9]+.[0-9]+" version.gradle.kts | head -1)
version=$(grep -Eo "[0-9]+.[0-9]+.[0-9]+" version.gradle.kts)
if [[ $version =~ ([0-9]+).([0-9]+).([0-9]+) ]]; then
major="${BASH_REMATCH[1]}"
minor="${BASH_REMATCH[2]}"
@ -85,7 +85,7 @@ jobs:
if [[ $patch == 0 ]]; then
if [[ $minor == 0 ]]; then
prior_major=$((major - 1))
prior_minor=$(grep -Po "^## Version $prior_major.\K([0-9]+)" CHANGELOG.md | head -1)
prior_minor=$(grep -Po "^## Version $prior_major.\K([0-9]+)" CHANGELOG.md | head -1)
prior_version="$prior_major.$prior_minor"
else
prior_version="$major.$((minor - 1)).0"