small ci fixups

Author: pestophagous

tools/ci/for_pip/requirements.txt

@@ -1,2 +1 @@
-aqtinstall==1.1.2
-importlib_metadata==3.4.0 # for py 3.7 and older. a kind of back-port version of 'importlib.metadata' (stdlib now provides it as of py 3.8)
+aqtinstall==1.2.3

tools/ci/get_qt_libs.sh

@@ -24,8 +24,9 @@ fi
 QTMIRROR='http://ftp.fau.de/qtproject'
 QTSIXMIRROR='http://ftp.fau.de/qtproject'
 
-sudo pip3 uninstall -y importlib_metadata || true # to prevent https://github.com/miurahr/aqtinstall/issues/221
-sudo pip3 install -r ${DIR}/for_pip/requirements.txt # install aqtinstall
+pip3 install --upgrade pip
+pip3 install setuptools
+pip3 install -r ${DIR}/for_pip/requirements.txt # install aqtinstall
 
 if [ -d $DL_FOLDER/Qt_desktop/5.15.0/gcc_64/bin ]; then
     echo "no need to download qt5 for desktop"

tools/ci/provision_win.sh

@@ -34,7 +34,12 @@ mkdir -p $DL_FOLDER/win_bin/
 pushd $DL_FOLDER/win_bin/ >& /dev/null
   curl -o clang-format-r375090.exe https://prereleases.llvm.org/win-snapshots/clang-format-r375090.exe
   curl -o clang-format-r375090.exe.sig https://prereleases.llvm.org/win-snapshots/clang-format-r375090.exe.sig
-  gpg --keyserver pgp.key-server.io --recv-key 345AD05D
+
+  # One of these recv-key calls must succeed, or else the '--verify' will fail afterward.
+  gpg --keyserver pgp.key-server.io    --recv-key 345AD05D || true
+  gpg --keyserver pgp.mit.edu          --recv-key 345AD05D || true
+  gpg --keyserver keyserver.ubuntu.com --recv-key 345AD05D || true
+
   gpg --verify clang-format-r375090.exe.sig clang-format-r375090.exe
   mv clang-format-r375090.exe clang-format-10
 popd >& /dev/null