actions: Add 'archive_branch' option to the GitHub Action.

This is important with the change from master => main for default branches.

Author: mattecapu

action.yml

@@ -14,6 +14,11 @@ inputs:
   github_personal_access_token:
     description: 'GitHub personal access token'
     required: true
+  archive_branch:
+    description: 'Branch where to commit archive files (should coincide with GH Pages branch)'
+    # legacy
+    required: false
+    default: 'master'
 runs:
   using: 'docker'
   image: 'Dockerfile'
@@ -23,3 +28,4 @@ runs:
     - ${{ inputs.zulip_bot_key }}
     - ${{ inputs.github_personal_access_token }}
     - ${{ inputs.delete_history }}
+    - ${{ inputs.archive_branch }}

entrypoint.sh

@@ -6,6 +6,7 @@ zulip_bot_email=$2
 zulip_bot_api_key=$3
 github_personal_access_token=$4
 delete_history=$5
+archive_branch=$6
 
 checked_out_repo_path="$(pwd)"
 html_dir_path=$checked_out_repo_path
@@ -36,7 +37,7 @@ auth_header="Authorization: Bearer ${github_personal_access_token}"
 accept_header="Accept: application/vnd.github.switcheroo-preview+json"
 page_api_url="https://api.github.com/repos/${GITHUB_REPOSITORY}/pages"
 # Enable GitHub pages
-curl -H "$auth_header" -H "$accept_header" --data "source=master" "$page_api_url"
+curl -H "$auth_header" -H "$accept_header" --data "source=${archive_branch}" "$page_api_url"
 
 print_site_url_code="import sys, json; print(json.load(sys.stdin)['html_url'])"
 github_pages_url_with_trailing_slash=$(curl -H "${auth_header}" $page_api_url | python3 -c "${print_site_url_code}")
@@ -75,11 +76,11 @@ python3 archive.py -b
 
 cd ${checked_out_repo_path}
 
-git checkout master
+git checkout $archive_branch
 
 git fetch origin
 
-current_sha="$(git rev-parse origin/master)"
+current_sha="$(git rev-parse origin/${archive_branch})"
 
 if [[ "$current_sha" != "$initial_sha" ]]
 then
@@ -104,7 +105,7 @@ git commit -m "Update archive."
 
 git remote add origin2 https://${GITHUB_ACTOR}:${github_personal_access_token}@github.com/${GITHUB_REPOSITORY}
 
-git push origin2 master -f
+git push origin2 $archive_branch -f
 
 echo "pushed"