[cantarell-fonts/rename-jobs] Rename CI jobs and refactor slightly

[Nikolaus Waxweiler <nwaxweiler src gnome org>]

commit 2bfc27c374b1504218ab7865afc22e155b395dce
Author: Nikolaus Waxweiler <madigens gmail com>
Date:   Wed Sep 1 09:11:50 2021 +0200

    Rename CI jobs and refactor slightly

 .gitlab-ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab985962..090a6ca1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-build-default:
+build-variable:
   image: 'registry.fedoraproject.org/fedora:latest'
   script:
     - dnf install -y git-core python3-pip meson ninja-build libappstream-glib-devel gettext python3.8
@@ -25,7 +25,7 @@ build-default:
       - prebuilt/*.otf
     expire_in: 7 days
 
-build-just-statics:
+build-statics:
   image: 'registry.fedoraproject.org/fedora:latest'
   script:
     - dnf install -y git-core python3-pip meson ninja-build libappstream-glib-devel gettext python3.8
@@ -33,12 +33,12 @@ build-just-statics:
     - python3.8 -m venv venv
     - . venv/bin/activate
     - pip3 install meson ninja -r requirements.txt
-    - meson build -D buildstatics=true -D buildvf=false
+    - meson rewrite default-options set buildstatics true
+    - meson rewrite default-options set buildvf false
+    - meson build
     - ninja -C build install
 
     # Make a dist package with prebuilt binaries.
-    - meson rewrite default-options set buildstatics true
-    - meson rewrite default-options set buildvf false
     - meson rewrite default-options set useprebuilt true
     - git add meson.build
     - cp /usr/local/share/fonts/cantarell/*.otf prebuilt