diff --git a/.github/scripts/update-version.sh b/.github/scripts/update-version.sh index d32f7262c4..66c6cac52a 100755 --- a/.github/scripts/update-version.sh +++ b/.github/scripts/update-version.sh @@ -1,10 +1,6 @@ #!/bin/bash -e -sed -Ei "s/[0-9]+\.[0-9]+\.[0-9]+/$1/" version.gradle.kts - -# also update versions in these files -# - examples/distro/build.gradle -# - examples/extension/build.gradle +version=$1 if [[ $version == *-SNAPSHOT ]]; then alpha_version=${version//-SNAPSHOT/-alpha-SNAPSHOT} @@ -12,6 +8,9 @@ else alpha_version=$version-alpha fi +sed -Ei "s/val stableVersion = \"[^\"]*\"/val stableVersion = \"$version\"/" version.gradle.kts +sed -Ei "s/val alphaVersion = \"[^\"]*\"/val alphaVersion = \"$alpha_version\"/" version.gradle.kts + sed -Ei "s/(opentelemetryJavaagent *: )\"[^\"]*\"/\1\"$version\"/" examples/distro/build.gradle sed -Ei "s/(opentelemetryJavaagentAlpha *: )\"[^\"]*\"/\1\"$alpha_version\"/" examples/distro/build.gradle diff --git a/.github/workflows/prepare-patch-release.yml b/.github/workflows/prepare-patch-release.yml index 5c598ce792..96435ef8f4 100644 --- a/.github/workflows/prepare-patch-release.yml +++ b/.github/workflows/prepare-patch-release.yml @@ -21,7 +21,7 @@ jobs: echo "VERSION=$major_minor.$((patch + 1))" >> $GITHUB_ENV - name: Update version - run: .github/scripts/update-version.sh $VERSION ${VERSION}-alpha + run: .github/scripts/update-version.sh $VERSION - name: Update download link version run: | diff --git a/.github/workflows/prepare-release-branch.yml b/.github/workflows/prepare-release-branch.yml index 68674469bb..e8575af9a9 100644 --- a/.github/workflows/prepare-release-branch.yml +++ b/.github/workflows/prepare-release-branch.yml @@ -21,12 +21,11 @@ jobs: echo "RELEASE_BRANCH_NAME=$release_branch_name" >> $GITHUB_ENV - name: Update version - run: .github/scripts/update-version.sh $VERSION ${VERSION}-alpha + run: .github/scripts/update-version.sh $VERSION - name: Update download link version run: | - version=$(.github/scripts/get-version.sh) - 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 + 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: .github/scripts/set-git-user.sh @@ -67,8 +66,7 @@ jobs: - name: Update version run: | - next_alpha_version=${NEXT_VERSION//-SNAPSHOT/}-alpha-SNAPSHOT - .github/scripts/update-version.sh $NEXT_VERSION $NEXT_ALPHA_VERSION + .github/scripts/update-version.sh $NEXT_VERSION - name: Set git user run: .github/scripts/set-git-user.sh