Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use latest branch for test library, and always get the latest major release when 2 digit wp versions are used #35

Merged
merged 5 commits into from Aug 11, 2017
Merged

Use latest branch for test library, and always get the latest major release when 2 digit wp versions are used #35

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6da37ba
get latest update for major release
jdub233 Aug 7, 2017
97759f5
fix tag reference
jdub233 Aug 7, 2017
707d15f
add missing local declaration
jdub233 Aug 8, 2017
7a2202e
use latest_version instead of wp_version
jdub233 Aug 8, 2017
c95e1cb
Merge branch 'master' into install-latest-update
jdub233 Aug 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 25 additions & 2 deletions templates/install-wp-tests.sh
View file
Open in desktop
Expand Up @@ -23,8 +23,15 @@ download() {
fi
}

if [[ $WP_VERSION =~ [0-9]+\.[0-9]+(\.[0-9]+)? ]]; then
WP_TESTS_TAG="tags/$WP_VERSION"
if [[ $WP_VERSION =~ ^[0-9]+\.[0-9]+$ ]]; then
WP_TESTS_TAG="branches/$WP_VERSION"
elif [[ $WP_VERSION =~ [0-9]+\.[0-9]+\.[0-9]+ ]]; then
if [[ $WP_VERSION =~ [0-9]+\.[0-9]+\.[0] ]]; then
# version x.x.0 means the first release of the major version, so strip off the .0 and download version x.x
WP_TESTS_TAG="tags/${WP_VERSION%??}"
else
WP_TESTS_TAG="tags/$WP_VERSION"
fi
elif [[ $WP_VERSION == 'nightly' || $WP_VERSION == 'trunk' ]]; then
WP_TESTS_TAG="trunk"
else
Expand Down Expand Up @@ -57,6 +64,22 @@ install_wp() {
else
if [ $WP_VERSION == 'latest' ]; then
local ARCHIVE_NAME='latest'
elif [[ $WP_VERSION =~ [0-9]+\.[0-9]+ ]]; then
# https serves multiple offers, whereas http serves single.
download https://api.wordpress.org/core/version-check/1.7/ /tmp/wp-latest.json
if [[ $WP_VERSION =~ [0-9]+\.[0-9]+\.[0] ]]; then
# version x.x.0 means the first release of the major version, so strip off the .0 and download version x.x
WP_VERSION=${WP_VERSION%??}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe this should use a temporary local variable, to not change the global $WP_VERSION, which other code might depend on.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, I was unsure of the best way to handle this. I had thought it might be okay to overwrite $WP_VERSION since the trailing zero (like 4.7.0) isn't actually a valid WP version. However, $WP_VERSION is a direct user supplied argument so probably better not to alter it in the script.

The most expedient solution would be to use $LATEST_VERSION. It's a little strange because it's not really the latest version, but maybe that's okay.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe the variable here should be renamed, since LATEST_VERSION doesn't make so much sense when fetching the initial major release. Perhaps using a variable called something likeDOWNLOAD_VERSION would be clearer?

else
# otherwise, scan the releases and get the most up to date minor version of the major release
local VERSION_ESCAPED=`echo $WP_VERSION | sed 's/\./\\\\./g'`
LATEST_VERSION=$(grep -o '"version":"'$VERSION_ESCAPED'[^"]*' /tmp/wp-latest.json | sed 's/"version":"//' | head -1)
fi
if [[ -z "$LATEST_VERSION" ]]; then
local ARCHIVE_NAME="wordpress-$WP_VERSION"
else
ARCHIVE_NAME="wordpress-$LATEST_VERSION"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

local missing here.

fi
else
local ARCHIVE_NAME="wordpress-$WP_VERSION"
fi
Expand Down