Auto merge of #8487 - dswij:8478, r=giraffate

[rust.git] / .github / deploy.sh

diff --git a/.github/deploy.sh b/.github/deploy.sh
index 4fcff830aa6ffcdf220b5f9f15b2c694941e73a7..34225a5402904084617e9f19adaaa762d0aa5336 100644 (file)
--- a/.github/deploy.sh
+++ b/.github/deploy.sh
@@ -8,36 +8,59 @@ rm -rf out/master/ || exit 0
 echo "Making the docs for master"
 mkdir out/master/
 cp util/gh-pages/index.html out/master
-python ./util/export.py out/master/lints.json
+cp util/gh-pages/lints.json out/master
 
 if [[ -n $TAG_NAME ]]; then
-  echo "Save the doc for the current tag ($TAG_NAME) and point current/ to it"
-  cp -r out/master "out/$TAG_NAME"
-  rm -f out/current
-  ln -s "$TAG_NAME" out/current
+  echo "Save the doc for the current tag ($TAG_NAME) and point stable/ to it"
+  cp -Tr out/master "out/$TAG_NAME"
+  rm -f out/stable
+  ln -s "$TAG_NAME" out/stable
+fi
+
+if [[ $BETA = "true" ]]; then
+  echo "Update documentation for the beta release"
+  cp -r out/master/* out/beta
 fi
 
 # Generate version index that is shown as root index page
 cp util/gh-pages/versions.html out/index.html
 
-cd out
-cat <<-EOF | python - > versions.json
-import os, json
-print json.dumps([
-    dir for dir in os.listdir(".") if not dir.startswith(".") and os.path.isdir(dir)
-])
-EOF
+echo "Making the versions.json file"
+python3 ./util/versions.py out
 
 # Now let's go have some fun with the cloned repo
+cd out
 git config user.name "GHA CI"
 git config user.email "gha@ci.invalid"
 
-if git diff --exit-code --quiet; then
-  echo "No changes to the output on this push; exiting."
-  exit 0
+if [[ -n $TAG_NAME ]]; then
+  # track files, so that the following check works
+  git add --intent-to-add "$TAG_NAME"
+  if git diff --exit-code --quiet -- $TAG_NAME/; then
+    echo "No changes to the output on this push; exiting."
+    exit 0
+  fi
+  # Add the new dir
+  git add "$TAG_NAME"
+  # Update the symlink
+  git add stable
+  # Update versions file
+  git add versions.json
+  git commit -m "Add documentation for ${TAG_NAME} release: ${SHA}"
+elif [[ $BETA = "true" ]]; then
+  if git diff --exit-code --quiet -- beta/; then
+    echo "No changes to the output on this push; exiting."
+    exit 0
+  fi
+  git add beta
+  git commit -m "Automatic deploy to GitHub Pages (beta): ${SHA}"
+else
+  if git diff --exit-code --quiet; then
+    echo "No changes to the output on this push; exiting."
+    exit 0
+  fi
+  git add .
+  git commit -m "Automatic deploy to GitHub Pages: ${SHA}"
 fi
 
-git add .
-git commit -m "Automatic deploy to GitHub Pages: ${SHA}"
-
 git push "$SSH_REPO" "$TARGET_BRANCH"