ci: Remove static build job

Now that we figured out why the build was failing on Fedora when the
profiling code was enabled, we can go back to building both shared and
static libraries by default.

1 files changed, 1 insertions, 33 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef92e1d696..276b3e903d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,7 @@ fedora-x86_64:
   image: registry.gitlab.gnome.org/gnome/gtk/fedora:v12
   stage: build
   variables:
-    EXTRA_MESON_FLAGS: "--buildtype=debug"
+    EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both"
   script:
     - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS}
             -Dx11-backend=true
@@ -62,38 +62,6 @@ fedora-x86_64:
     key: "$CI_JOB_NAME"
     <<: *cache-paths
 
-static-build:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v12
-  stage: build
-  variables:
-    EXTRA_MESON_FLAGS: "--default-library=both"
-  script:
-    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS}
-            -Dx11-backend=true
-            -Dwayland-backend=true
-            -Dbroadway-backend=true
-            -Dvulkan=yes
-            _build
-    - ninja -C _build
-    - .gitlab-ci/run-tests.sh _build
-    - .gitlab-ci/meson-junit-report.py
-            --project-name=gtk
-            --job-id="${CI_JOB_NAME}"
-            --output=_build/report.xml
-            _build/meson-logs/testlog.json
-  artifacts:
-    when: always
-    reports:
-      junit:
-        - "${CI_PROJECT_DIR}/_build/report.xml"
-    name: "gtk-${CI_COMMIT_REF_NAME}"
-    paths:
-      - "${CI_PROJECT_DIR}/_build/meson-logs"
-      - "${CI_PROJECT_DIR}/_build/report.xml"
-  cache:
-    key: "$CI_JOB_NAME"
-    <<: *cache-paths
-
 release-build:
   image: registry.gitlab.gnome.org/gnome/gtk/fedora:v12
   stage: build