Skip to content

Commit 26e007e

Browse files
committed
Some bash improvements
1 parent 7ca8ce9 commit 26e007e

2 files changed

Lines changed: 3 additions & 6 deletions

File tree

.github/actions/spring-website-project-version-update/action.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ runs:
3838
MAJOR_MINOR=$(echo "$NEW_VERSION" | cut -d '.' -f1-2)
3939
4040
# Fetch OSS support end date
41-
OSS_SUPPORT_END_DATE=$(curl "${CURL_OPTS[@]}" "$BASE_URL/generations/${MAJOR_MINOR}.x" \
42-
| jq -r '.ossSupportEndDate // empty')
41+
OSS_SUPPORT_END_DATE=$(curl "${CURL_OPTS[@]}" "$BASE_URL/generations/${MAJOR_MINOR}.x" | jq -r '.ossSupportEndDate // empty')
4342
4443
VERSIONS_TO_UPDATE=$NEW_VERSION
4544

.github/workflows/spring-finalize-release.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,8 @@ jobs:
8181
8282
- name: Changelog Config File
8383
run: |
84-
repositoryTeam=$(gh api repos/$GITHUB_REPOSITORY/collaborators --jq 'map(select(.role_name == "admin") | .login) | tostring')
85-
repositoryTeam=$(sed 's/"//g' <<< ${repositoryTeam:1:-1})
86-
repositoryVisibility=$(gh repo view --json visibility --jq .[])
87-
repositoryVisibility=$([[ $repositoryVisibility = 'PUBLIC' ]] && echo 'true' || echo 'false')
84+
repositoryTeam=$(gh api repos/$GITHUB_REPOSITORY/collaborators --jq 'map(select(.role_name == "admin") | .login) | join(",")')
85+
repositoryVisibility=$(gh repo view --json visibility --jq 'if .visibility == "PUBLIC" then "true" else "false" end')
8886
8987
echo "changelog.contributors.exclude.names=$repositoryTeam" > changelog.properties
9088
echo "changelog.issues.generate-links=$repositoryVisibility" >> changelog.properties

0 commit comments

Comments
 (0)