[glib: 9/9] Merge branch 'wip/pwithnall/ci-cleanups' into 'main'

[Nirbheek Chauhan <nirbheekc src gnome org>]

commit 94f3bb70748c5add7f35e1556e32cfff754a850d
Merge: 60e8b48be 5d40604fa
Author: Nirbheek Chauhan <nirbheek chauhan gmail com>
Date:   Mon Feb 21 15:31:41 2022 +0000

    Merge branch 'wip/pwithnall/ci-cleanups' into 'main'
    
    ci: Various cleanups and moving Android API 21 and FreeBSD 12 to scheduled run
    
    See merge request GNOME/glib!2514

 .gitlab-ci.yml                    | 91 ++++++++++++++++++++++-----------------
 .gitlab-ci/android-ndk.Dockerfile |  1 -
 .gitlab-ci/android-setup-env.sh   | 15 -------
 3 files changed, 52 insertions(+), 55 deletions(-)
---