Update tz to 2021a

.github/bin/update-tz.sh

@@ -0,0 +1,42 @@
+#!/bin/sh
+
+main() {
+    auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+    git submodule sync --recursive
+    git -c "http.extraheader=$auth_header" -c protocol.version=2 \
+        submodule update --init --force --recursive
+
+    set -xeu
+
+    cd tz
+
+    git fetch --tags --quiet origin
+    orig_tag="$(git describe)"
+
+    git checkout main
+    git pull --ff-only
+
+    new_tag="$(git describe --abbrev=0)"
+
+    if [ "$new_tag" != "$orig_tag" ]; then
+        git reset --hard "$new_tag"
+        cd ..
+        git add tz
+        tz_branch="update-tz-${new_tag}"
+        git checkout -b "$tz_branch"
+        git config user.name "Brandon W Maister"
+        git config user.email "quodlibetor@gmail.com"
+        msg="Update tz $orig_tag -> $new_tag"
+        git commit -m "$msg"
+        git push -u origin "$tz_branch"
+        echo "::set-output name=did_update::yes"
+        echo "::set-env name=PULL_REQUEST_FROM_BRANCH::${tz_branch}"
+        echo "::set-env name=PULL_REQUEST_TITLE::$msg"
+        echo "::set-env name=PULL_REQUEST_BODY=''"
+        echo "::set-env name=PULL_REQUEST_REVIEWERS='quodlibetor djzin'"
+    else
+        echo "::set-output name=did_update::no"
+    fi
+}
+
+main

.github/workflows/rust.yml

@@ -10,7 +10,7 @@ jobs:
   test:
     strategy:
       matrix:
-        os: [ubuntu-latest, ubuntu-16.04, macos-latest]
+        os: [ubuntu-latest, ubuntu-18.04, macos-latest]
         include:
           - os: ubuntu-latest
             run_no_std: true

.github/workflows/update-tz.yml

@@ -12,43 +12,7 @@ jobs:
       - name: Checkout and update submodules
         id: update_tz
         shell: sh
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 \
-              submodule update --init --force --recursive
-
-          set -xeu
-
-          cd tz
-
-          git fetch --tags --quiet origin
-          orig_tag="$(git describe)"
-
-          git checkout master
-          git pull --ff-only
-
-          new_tag="$(git describe --abbrev=0)"
-
-          if [ "$new_tag" != "$orig_tag" ]; then
-              git reset --hard "$new_tag"
-              cd ..
-              git add tz
-              tz_branch="update-tz-${new_tag}"
-              git checkout -b "$tz_branch"
-              git config user.name "Brandon W Maister"
-              git config user.email "quodlibetor@gmail.com"
-              msg="Update tz $orig_tag -> $new_tag"
-              git commit -m "$msg"
-              git push -u origin "$tz_branch"
-              echo "::set-output name=did_update::yes"
-              echo "::set-env name=PULL_REQUEST_FROM_BRANCH::${tz_branch}"
-              echo "::set-env name=PULL_REQUEST_TITLE::$msg"
-              echo "::set-env name=PULL_REQUEST_BODY=''"
-              echo "::set-env name=PULL_REQUEST_REVIEWERS='quodlibetor djzin'"
-          else
-              echo "::set-output name=did_update::no"
-          fi
+        run: .github/bin/update-tz.sh
       - name: Create Pull Request
         uses: quodlibetor/pull-request-action@1.0.6-patch1
         if: ${{ steps.update_tz.outputs.did_update == 'yes' }}