Skip to content

Commit fc7d0f8

Browse files
committed
chore(java-cloud-bom): prefix BOM tags with libraries-bom/ and add pre-install to GHA release-notes workflow
1 parent 1309124 commit fc7d0f8

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

.github/workflows/java-cloud-bom-release-note-generation.yaml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ jobs:
4040
java-version: 11
4141
cache: maven
4242
- run: java -version
43+
- name: Pre-install Snapshot Dependencies
44+
run: |
45+
bash java-cloud-bom/tests/pre-install.sh
46+
shell: bash
4347
- name: Pick Libraries BOM version
4448
id: pick-version
4549
shell: bash
@@ -48,13 +52,10 @@ jobs:
4852
if [ -n "${WORKFLOW_DISPATCH_INPUT}" ]; then
4953
echo "WORKFLOW_DISPATCH_INPUT: ${WORKFLOW_DISPATCH_INPUT}"
5054
echo "libraries-bom-version=${WORKFLOW_DISPATCH_INPUT}" >> $GITHUB_OUTPUT
51-
elif [[ "${GITHUB_REF}" == *"refs/tags/v"* ]]; then
52-
# https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#release
53-
# Example value of GITHUB_REF: refs/tags/v26.5.0
54-
# With the single-component setup of Release Please, the Libraries BOM
55-
# version is the version of this repository release.
55+
elif [[ "${GITHUB_REF}" == *"refs/tags/"* ]]; then
56+
# Example value of GITHUB_REF: refs/tags/libraries-bom/v26.5.0
5657
echo "GITHUB_REF: ${GITHUB_REF}"
57-
VERSION=${GITHUB_REF#refs/*/v}
58+
VERSION=${GITHUB_REF#*v}
5859
echo "libraries-bom-version=${VERSION}" >> $GITHUB_OUTPUT
5960
else
6061
echo "Couldn't find the Libraries BOM version. WORKFLOW_DISPATCH_INPUT \
@@ -85,7 +86,7 @@ jobs:
8586
GH_TOKEN: ${{ github.token }}
8687
- name: Update the release note with release_note.md
8788
run: |
88-
TAG="v${LIBRARIES_BOM_VERSION}"
89+
TAG="libraries-bom/v${LIBRARIES_BOM_VERSION}"
8990
echo "Updating ${TAG}"
9091
gh release edit "${TAG}" --notes-file release_note.md
9192
working-directory: java-cloud-bom/release-note-generation

java-cloud-bom/release-please-config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
"release-type": "java-yoshi",
33
"versioning": "always-bump-minor",
44
"separate-pull-requests": false,
5-
"include-component-in-tag": false,
5+
"include-component-in-tag": true,
66
"packages": {
77
".": {
8+
"component": "libraries-bom",
89
"extra-files": ["README.md"]
910
}
1011
}

0 commit comments

Comments
 (0)