use the correct versions to regen the japicmp files (#6451)
This commit is contained in:
parent
2b5ac31a5b
commit
8d85b580b2
|
|
@ -30,19 +30,20 @@ jobs:
|
||||||
- name: Set environment variables
|
- name: Set environment variables
|
||||||
run: |
|
run: |
|
||||||
version=$(.github/scripts/get-version.sh)
|
version=$(.github/scripts/get-version.sh)
|
||||||
if [[ $version =~ ^([0-9]+)\.([0-9]+)\.0$ ]]; then
|
|
||||||
major="${BASH_REMATCH[1]}"
|
|
||||||
minor="${BASH_REMATCH[2]}"
|
|
||||||
next_version="$major.$((minor + 1)).0"
|
|
||||||
else
|
|
||||||
echo "unexpected version: $version"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
echo "NEXT_VERSION=$next_version" >> $GITHUB_ENV
|
|
||||||
echo "VERSION=$version" >> $GITHUB_ENV
|
echo "VERSION=$version" >> $GITHUB_ENV
|
||||||
prior_version=$(.github/scripts/get-prior-version.sh)
|
prior_version=$(.github/scripts/get-prior-version.sh)
|
||||||
echo "PRIOR_VERSION=$prior_version" >> $GITHUB_ENV
|
echo "PRIOR_VERSION=$prior_version" >> $GITHUB_ENV
|
||||||
|
if [[ $prior_version =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)$ ]]; then
|
||||||
|
major="${BASH_REMATCH[1]}"
|
||||||
|
minor="${BASH_REMATCH[2]}"
|
||||||
|
patch="${BASH_REMATCH[3]}"
|
||||||
|
|
||||||
|
two_releases_ago="$major.$((minor - 1)).$patch"
|
||||||
|
else
|
||||||
|
echo "unexpected prior version: $prior_version"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "TWO_VERSIONS_AGO=$two_releases_ago" >> $GITHUB_ENV
|
||||||
- name: Use CLA approved github bot
|
- name: Use CLA approved github bot
|
||||||
run: .github/scripts/use-cla-approved-github-bot.sh
|
run: .github/scripts/use-cla-approved-github-bot.sh
|
||||||
|
|
||||||
|
|
@ -51,13 +52,13 @@ jobs:
|
||||||
# not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
|
# not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
|
||||||
GH_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
|
GH_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
|
||||||
run: |
|
run: |
|
||||||
./gradlew updateVersionInDocs -Prelease.version=$VERSION
|
./gradlew updateVersionInDocs -Prelease.version=$PRIOR_VERSION
|
||||||
./gradlew japicmp -PapiBaseVersion=$PRIOR_VERSION -PapiNewVersion=$VERSION
|
./gradlew japicmp -PapiBaseVersion=$TWO_VERSIONS_AGO -PapiNewVersion=$PRIOR_VERSION
|
||||||
./gradlew --refresh-dependencies japicmp
|
./gradlew --refresh-dependencies japicmp
|
||||||
|
|
||||||
message="Post release for version $VERSION"
|
message="Post release for version $PRIOR_VERSION"
|
||||||
body="Post-release updates for version \`$VERSION\`."
|
body="Post-release updates for version \`$PRIOR_VERSION\`."
|
||||||
branch="opentelemetrybot/post-release-for-${VERSION}"
|
branch="opentelemetrybot/post-release-for-${PRIOR_VERSION}"
|
||||||
|
|
||||||
git checkout -b $branch
|
git checkout -b $branch
|
||||||
git commit -a -m "$message"
|
git commit -a -m "$message"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue