Skip to content

Commit 5542a5d

Browse files
authored
Merge pull request #482 from github/fix-releases-output
Fix for unsupported version check
2 parents 7fa39db + 7368825 commit 5542a5d

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

test/test-ghe-host-check.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,14 @@ begin_test "ghe-host-check detects unsupported GitHub Enterprise Server versions
5656
read -r bu_version_major bu_version_minor _ <<<$(ghe_parse_version $BACKUP_UTILS_VERSION)
5757
bu_major_minor="$bu_version_major.$bu_version_minor"
5858
releases=$(/usr/bin/curl -s https://github-enterprise.s3.amazonaws.com/release/latest.json)
59-
supported=$(echo $releases | jq -r 'select(."'${bu_major_minor}'")')
59+
latest_value=$(echo "$releases" | jq -r '.latest')
60+
latest_major_version=$(echo $latest_value | cut -d "." -f 1-2)
61+
# Replace "latest" with the derived major version in the releases string
62+
releases_with_replacement=$(echo "$releases" | sed 's/"latest"/"'"$latest_major_version"'"/g')
63+
# Use the modified releases string as needed
64+
supported=$(echo "$releases_with_replacement" | jq -r 'select(."'${bu_major_minor}'")')
6065
# shellcheck disable=SC2207 # Command required as alternatives fail
61-
keys=($(echo $releases | jq -r 'keys[]'))
66+
keys=($(echo "$releases_with_replacement" | jq -r 'keys[]'))
6267

6368
if [ -z "$supported" ]
6469
then
@@ -87,7 +92,6 @@ begin_test "ghe-host-check detects unsupported GitHub Enterprise Server versions
8792
GHE_TEST_REMOTE_VERSION=$bu_version_major.$bu_version_minor.999gm1 ghe-host-check
8893
! GHE_TEST_REMOTE_VERSION=3.9999.1521793591.performancetest ghe-host-check
8994
GHE_TEST_REMOTE_VERSION=$((bu_version_major+1)).0.0 ghe-host-check
90-
9195
)
9296
end_test
9397

0 commit comments

Comments
 (0)