[glib: 1/2] gitlab-ci: remove meson-junit-report.py conversion

[Emmanuele Bassi <ebassi src gnome org>]

commit c8ce3786d703ae5ef3f3776e7ba798296de4e192
Author: Marc-André Lureau <marcandre lureau redhat com>
Date:   Wed May 25 12:53:17 2022 +0200

    gitlab-ci: remove meson-junit-report.py conversion
    
    meson supports JUnit XML format since 0.55.
    
    Signed-off-by: Marc-André Lureau <marcandre lureau redhat com>

 .gitlab-ci.yml                   |  22 +++----
 .gitlab-ci/meson-junit-report.py | 125 ---------------------------------------
 .gitlab-ci/run-tests.sh          |   6 --
 .gitlab-ci/test-msvc.bat         |   5 --
 .gitlab-ci/test-msys2.sh         |   6 --
 5 files changed, 11 insertions(+), 153 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ee731b1fb5..b84ea52f80 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -88,7 +88,7 @@ fedora-x86_64:
     - lcov --config-file .lcovrc --directory _build --capture --output-file "_coverage/${CI_JOB_NAME}.lcov"
   artifacts:
     reports:
-      junit: "_build/${CI_JOB_NAME}-report.xml"
+      junit: "_build/meson-logs/testlog.junit.xml"
     name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
     when: always
     expire_in: 1 week
@@ -130,7 +130,7 @@ debian-stable-x86_64:
     - .gitlab-ci/run-tests.sh
   artifacts:
     reports:
-      junit: "_build/${CI_JOB_NAME}-report.xml"
+      junit: "_build/meson-logs/testlog.junit.xml"
     name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
     when: always
     expire_in: 1 week
@@ -197,7 +197,7 @@ G_DISABLE_ASSERT:
     - bash -x ./.gitlab-ci/run-tests.sh
   artifacts:
     reports:
-      junit: "_build/${CI_JOB_NAME}-report.xml"
+      junit: "_build/meson-logs/testlog.junit.xml"
     name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
     when: always
     expire_in: 1 week
@@ -234,7 +234,7 @@ valgrind:
   allow_failure: true
   artifacts:
     reports:
-      junit: "_build/${CI_JOB_NAME}-report.xml"
+      junit: "_build/meson-logs/testlog.junit.xml"
     name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
     when: always
     expire_in: 1 week
@@ -275,7 +275,7 @@ cross-mingw64:
     - ninja -C _build
   artifacts:
     reports:
-      junit: "_build/${env:CI_JOB_NAME}-report.xml"
+      junit: "_build/meson-logs/testlog.junit.xml"
     name: "glib-${env:CI_JOB_NAME}-${env:CI_COMMIT_REF_NAME}"
     when: always
     expire_in: 1 week
@@ -303,7 +303,7 @@ msys2-mingw32:
     - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2.sh"
   artifacts:
     reports:
-      junit: "_build/${env:CI_JOB_NAME}-report.xml"
+      junit: "_build/meson-logs/testlog.junit.xml"
     name: "glib-${env:CI_JOB_NAME}-${env:CI_COMMIT_REF_NAME}"
     when: always
     expire_in: 1 week
@@ -327,7 +327,7 @@ vs2017-x64:
                                --python.purelibdir=C:\Python37\site-packages
   artifacts:
     reports:
-      junit: "_build/${env:CI_JOB_NAME}-report.xml"
+      junit: "_build/meson-logs/testlog.junit.xml"
     name: "glib-${env:CI_JOB_NAME}-${env:CI_COMMIT_REF_NAME}"
     when: always
     expire_in: 1 week
@@ -356,7 +356,7 @@ vs2017-x64-static:
                                --python.purelibdir=C:\Python37\site-packages
   artifacts:
     reports:
-      junit: "_build/${env:CI_JOB_NAME}-report.xml"
+      junit: "_build/meson-logs/testlog.junit.xml"
     name: "glib-${env:CI_JOB_NAME}-${env:CI_COMMIT_REF_NAME}"
     when: always
     expire_in: 1 week
@@ -400,7 +400,7 @@ freebsd-12-x86_64:
     - bash -x ./.gitlab-ci/run-tests.sh
   artifacts:
     reports:
-      junit: "_build/${CI_JOB_NAME}-report.xml"
+      junit: "_build/meson-logs/testlog.junit.xml"
     name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
     when: always
     expire_in: 1 week
@@ -428,7 +428,7 @@ freebsd-13-x86_64:
     - bash -x ./.gitlab-ci/run-tests.sh
   artifacts:
     reports:
-      junit: "_build/${CI_JOB_NAME}-report.xml"
+      junit: "_build/meson-logs/testlog.junit.xml"
     name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
     when: always
     expire_in: 1 week
@@ -466,7 +466,7 @@ macos:
     - .gitlab-ci/run-tests.sh
   artifacts:
     reports:
-      junit: "_build/${CI_JOB_NAME}-report.xml"
+      junit: "_build/meson-logs/testlog.junit.xml"
     name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
     when: always
     expire_in: 1 week
diff --git a/.gitlab-ci/run-tests.sh b/.gitlab-ci/run-tests.sh
index b545a6f3c1..52461ca10e 100755
--- a/.gitlab-ci/run-tests.sh
+++ b/.gitlab-ci/run-tests.sh
@@ -20,10 +20,4 @@ meson test \
 
 exit_code=$?
 
-python3 .gitlab-ci/meson-junit-report.py \
-        --project-name=glib \
-        --job-id "${CI_JOB_NAME}" \
-        --output "_build/${CI_JOB_NAME}-report.xml" \
-        "${log_file}"
-
 exit $exit_code
diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat
index 55bc71bf22..37976d4d00 100644
--- a/.gitlab-ci/test-msvc.bat
+++ b/.gitlab-ci/test-msvc.bat
@@ -21,11 +21,6 @@ meson test -C _build --timeout-multiplier %MESON_TEST_TIMEOUT_MULTIPLIER% --no-s
 
 :: FIXME: can we get code coverage support?
 
-
-python "%CD%\.gitlab-ci\meson-junit-report.py" --project-name glib ^
---job-id "%CI_JOB_NAME%" --output "%CD%/_build/%CI_JOB_NAME%-report.xml" ^
-"%CD%/_build/meson-logs/testlog.json"
-
 goto :EOF
 :error
 exit /b 1
diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh
index fbfbbcdcfd..85ed88f3fe 100755
--- a/.gitlab-ci/test-msys2.sh
+++ b/.gitlab-ci/test-msys2.sh
@@ -53,12 +53,6 @@ lcov \
 # FIXME: fix the test suite
 meson test --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" --no-suite flaky || true
 
-python3 "${DIR}"/.gitlab-ci/meson-junit-report.py \
-        --project-name glib \
-        --job-id "${CI_JOB_NAME}" \
-        --output "${DIR}/_build/${CI_JOB_NAME}-report.xml" \
-        "${DIR}/_build/meson-logs/testlog.json"
-
 lcov \
     --quiet \
     --config-file "${DIR}"/.lcovrc \