update docs builder workflow to ubuntu 22.04, get invoke from apt

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index c02b266a22fc29d53ed1a336858db185de4e0ac5..a03c005273ea6abda23ffe7d0708eeec9d1a6288 100644 (file)
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -13,7 +13,7 @@ permissions:
 jobs:
   build-upload-docs:
     name: Build and upload docs
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: PowerDNS/pdns/set-ubuntu-mirror@meta
       - uses: actions/checkout@v3

diff --git a/build-scripts/gh-actions-setup-inv-no-dist-upgrade b/build-scripts/gh-actions-setup-inv-no-dist-upgrade
index e2e18aa60f2b71d52db31b6b76fc15e147403d6f..49fe23a919f76e1e177d68d1b7ebf7636c7ca1cd 100755 (executable)
--- a/build-scripts/gh-actions-setup-inv-no-dist-upgrade
+++ b/build-scripts/gh-actions-setup-inv-no-dist-upgrade
@@ -6,7 +6,6 @@ EOF
 "
 sudo chmod 755 /usr/sbin/policy-rc.d
 sudo apt-get update
-sudo apt-get -qq -y --no-install-recommends install python3-pip
-sudo pip3 install git+https://github.com/pyinvoke/invoke@faa5728a6f76199a3da1750ed952e7efee17c1da
+sudo apt-get -qq -y --no-install-recommends install python3-pip python3-invoke
 sudo pip3 install gitpython
 sudo pip3 install unidiff