diff --git a/spec_on_pages.sh b/spec_on_pages.sh index 57f39b0f5d542549ddc7d58eb632378b51cff7a4..3b92a0a5a1aa354bccc64a2d848f3a8b81f59f35 100644 --- a/spec_on_pages.sh +++ b/spec_on_pages.sh @@ -96,8 +96,8 @@ if [ ${11} == "false" ]; then minorVersion=$(echo ${10} | cut -d. -f3) echo "Major version is ${majorVersion}" if [ -n "${majorVersion}" ]; then - latest="latestR${majorVersion}" - echo "Handling release ${latest}" + releaseVersion="latestR${majorVersion}" + echo "Handling release ${releaseVersion}" fi if [ -z "${majorVersion}" ] || [ -z "${interVersion}" ] || [ -z "${minorVersion}" ]; then @@ -106,10 +106,10 @@ if [ ${11} == "false" ]; then else isPagesSet=$(mike list --deploy-prefix public -r $HTTPS_REMOTE -b $PAGES_BRANCH) if [ -z "${isPagesSet}" ]; then - mike deploy --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH -u ${10} ${latest} latest + mike deploy --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH -u ${10} ${releaseVersion} latest mike set-default --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH latest #That's only needed the first time gl-pages is created else - latestVersionDeployed=$(mike list --deploy-prefix public -r $HTTPS_REMOTE -b $PAGES_BRANCH | grep ${latest} | cut -d" " -f1) + latestVersionDeployed=$(mike list --deploy-prefix public -r $HTTPS_REMOTE -b $PAGES_BRANCH | grep ${releaseVersion} | cut -d" " -f1) latestVersionDeployed_inter=$(echo ${latestVersionDeployed} |cut -d. -f2 ) latestVersionDeployed_minor=$(echo ${latestVersionDeployed} |cut -d. -f3 ) latestRelease=$(mike list --deploy-prefix public -r $HTTPS_REMOTE -b $PAGES_BRANCH | grep latest\, | grep -o latestR[0-9]*) @@ -117,16 +117,18 @@ if [ ${11} == "false" ]; then echo "Latest deployed version for this release is ${latestVersionDeployed}" ##Handling versions: update latestRelease and latest (majorVersion updated) - if [[ "${latest}" > "${latestRelease}" ]]; then - echo "Upgrade latest release...deploying version ${10} as latest and ${latest}" - mike deploy --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH -u ${10} ${latest} latest - elif [[ "${latest}" == "${latestRelease}" ]]; then + if [[ "${releaseVersion}" > "${latestRelease}" ]]; then + echo "Upgrade latest release...deploying version ${10} as latest and ${releaseVersion}" + mike deploy --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH -u ${10} ${releaseVersion} latest + elif [[ "${releaseVersion}" == "${latestRelease}" ]]; then if [[ ${latestVersionDeployed_inter} == ${interVersion} ]]; then if [[ ${latestVersionDeployed_minor} < ${minorVersion} || ${latestVersionDeployed_minor} == ${minorVersion} ]]; then - echo "Upgrade latest release...deploying version ${10} as latest and ${latest}" - mike deploy --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH -u ${10} ${latest} latest - echo "Hidding version ${latestVersionDeployed}..." - mike props --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH --set hidden=true "${latestVersionDeployed}" + echo "Upgrade latest release...deploying version ${10} as latest and ${releaseVersion}" + mike deploy --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH -u ${10} ${releaseVersion} latest + if [[ ${latestVersionDeployed_minor} < ${minorVersion} ]]; then + echo "Hidding version ${latestVersionDeployed}..." + mike props --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH --set hidden=true "${latestVersionDeployed}" + fi else echo "Deploying version ${10}" mike deploy --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH -u ${10} @@ -134,8 +136,8 @@ if [ ${11} == "false" ]; then mike props --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH --set hidden=true "${10}" fi elif [[ ${latestVersionDeployed_inter} < ${interVersion} ]]; then - echo "Upgrade latest release...deploying version ${10} as latest and ${latest}" - mike deploy --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH -u ${10} ${latest} latest + echo "Upgrade latest release...deploying version ${10} as latest and ${releaseVersion}" + mike deploy --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH -u ${10} ${releaseVersion} latest else echo "Deploying version ${10}" mike deploy --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH -u ${10} @@ -143,10 +145,12 @@ if [ ${11} == "false" ]; then else if [[ ${latestVersionDeployed_inter} == ${interVersion} ]]; then if [[ ${latestVersionDeployed_minor} < ${minorVersion} || ${latestVersionDeployed_minor} == ${minorVersion} ]]; then - echo "Deploying version ${10} as ${latest}" - mike deploy --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH -u ${10} ${latest} - echo "Hidding version ${latestVersionDeployed}..." - mike props --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH --set hidden=true "${latestVersionDeployed}" + echo "Deploying version ${10} as ${releaseVersion}" + mike deploy --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH -u ${10} ${releaseVersion} + if [[ ${latestVersionDeployed_minor} < ${minorVersion} ]]; then + echo "Hidding version ${latestVersionDeployed}..." + mike props --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH --set hidden=true "${latestVersionDeployed}" + fi else echo "Deploying version ${10}" mike deploy --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH -u ${10} @@ -154,8 +158,8 @@ if [ ${11} == "false" ]; then mike props --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH --set hidden=true "${10}" fi elif [[ ${latestVersionDeployed_inter} < ${interVersion} ]]; then - echo "Deploying version ${10} as ${latest}" - mike deploy --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH -u ${10} ${latest} + echo "Deploying version ${10} as ${releaseVersion}" + mike deploy --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH -u ${10} ${releaseVersion} else echo "Deploying version ${10}" mike deploy --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH -u ${10} @@ -176,19 +180,19 @@ else majorVersion=$(echo ${11} | grep -o v[0-9]*\. | grep -o [0-9]*) if [ -n "${majorVersion}" ]; then previousVersion=$(mike list --deploy-prefix public -r $HTTPS_REMOTE -b $PAGES_BRANCH | grep v${majorVersion} | grep -A1 ${11} | grep -v ${11}) - latest="latestR${majorVersion}" + releaseVersion="latestR${majorVersion}" echo "Major version is ${majorVersion}" echo "Previous version is ${previousVersion}" fi isLatest=$(mike list --deploy-prefix public -r $HTTPS_REMOTE -b $PAGES_BRANCH ${11} | grep -o latest\, ) - isLatestRelease=$(mike list --deploy-prefix public -r $HTTPS_REMOTE -b $PAGES_BRANCH ${11} | grep -o ${latest} ) + isLatestRelease=$(mike list --deploy-prefix public -r $HTTPS_REMOTE -b $PAGES_BRANCH ${11} | grep -o ${releaseVersion} ) echo "This is isLatest: $isLatest" echo "This is isLatestRelease: $isLatestRelease" ## Deal with alias latest if [ -n "${isLatest}" ]; then if [ -n "${previousVersion}" ]; then - mike alias --deploy-prefix public -r $HTTPS_REMOTE --allow-empty -p -b $PAGES_BRANCH -u ${previousVersion} ${latest} latest + mike alias --deploy-prefix public -r $HTTPS_REMOTE --allow-empty -p -b $PAGES_BRANCH -u ${previousVersion} ${releaseVersion} latest mike props --deploy-prefix public -r $HTTPS_REMOTE --allow-empty -p -b $PAGES_BRANCH --set hidden=false ${previousVersion} else # Look previous release (previous major version) @@ -205,10 +209,10 @@ else fi elif [ -n "${isLatestRelease}" ]; then if [ -n "${previousVersion}" ]; then - mike alias --deploy-prefix public -r $HTTPS_REMOTE --allow-empty -p -b $PAGES_BRANCH -u ${previousVersion} ${latest} + mike alias --deploy-prefix public -r $HTTPS_REMOTE --allow-empty -p -b $PAGES_BRANCH -u ${previousVersion} ${releaseVersion} mike props --deploy-prefix public -r $HTTPS_REMOTE --allow-empty -p -b $PAGES_BRANCH --set hidden=false ${previousVersion} else - echo "Warning: no ${latest} available!!" + echo "Warning: no ${releaseVersion} available!!" fi #Deal with moving down a release fi