[vlc-commits] [Git][videolan/vlc][master] 3 commits: extras: ci: bump debian image

[Felix Paul Kühne (@fkuehne)]

Felix Paul Kühne pushed to branch master at VideoLAN / VLC


Commits:
c6d53be3 by Alexandre Janniaux at 2023-08-26T19:11:08+00:00
extras: ci: bump debian image

Add support for gcovr.

- - - - -
931a2fa4 by Alexandre Janniaux at 2023-08-26T19:11:08+00:00
extras: tools: bump meson to 1.2.0

Meson 1.0.0 allows writing 0x0 characters into the junit test output,
which is not allowed in XML files and it prevents gitlab CI from parsing
the output of the tests. This can be checked locally with:

    meson setup build
    meson test -C build css_parser
    xmllint build/meson-logs/testlog.junit.xml

- - - - -
1a2a3015 by Alexandre Janniaux at 2023-08-26T19:11:08+00:00
extras: ci: add meson coverage and testunit reports

Report the coverage from meson and list the output of the tests, since
meson already supply a junit-compatible output.

- - - - -


3 changed files:

- extras/ci/gitlab-ci.yml
- extras/tools/SHA512SUMS
- extras/tools/packages.mak


Changes:

=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -24,7 +24,7 @@ variables:
     VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64:20221214115142
     VLC_WIN_LLVM_MSVCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-msvcrt:20221214101739
     VLC_WIN_LLVM_UCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-ucrt:20230523085945
-    VLC_DEBIAN_IMAGE: registry.videolan.org/vlc-debian-unstable:20230705133021
+    VLC_DEBIAN_IMAGE: registry.videolan.org/vlc-debian-unstable:20230823133818
     VLC_ANDROID_IMAGE: registry.videolan.org/vlc-debian-android:20230606050714
     VLC_SNAP_IMAGE: registry.videolan.org/vlc-ubuntu-focal:20221023195550
     VLC_RASPBIAN_IMAGE: registry.videolan.org/vlc-ubuntu-raspberry:20230803092625
@@ -354,7 +354,7 @@ debian-meson:
         - |
             echo -e "\e[0Ksection_start:$(date +%s):setup_meson_section\r\e[0KMeson setup"
             # Setup meson build dir
-            meson setup build-meson || (echo "ERROR: Meson setup failed!" >&2 ; cat build-meson/meson-logs/meson-log.txt >&2 ; exit 1)
+            meson setup -Db_coverage=true build-meson || (echo "ERROR: Meson setup failed!" >&2 ; cat build-meson/meson-logs/meson-log.txt >&2 ; exit 1)
             echo -e "\e[0Ksection_end:$(date +%s):setup_meson_section\r\e[0K"
 
         - |
@@ -368,8 +368,29 @@ debian-meson:
             # Run tests
             meson test -C build-meson || (echo "ERROR: Tests failed!" >&2 ; cat build-meson/meson-logs/testlog.txt >&2 ; exit 3)
             echo -e "\e[0Ksection_end:$(date +%s):tests_meson_section\r\e[0K"
+
+        - |
+            # We split in two different commands to handle the case where
+            # the coverage will be generated on different jobs later.
+            mkdir html-coverage
+            gcovr -r "${CI_PROJECT_DIR}/" --json "${CI_PROJECT_DIR}/${CI_JOB_NAME}.cov.json" -j4
+        - >
+            gcovr --add-tracefile "${CI_PROJECT_DIR}/${CI_JOB_NAME}.cov.json"
+            --xml="cobertura.xml"
+            --html="html-coverage/vlc.html"
+            --html-details -s
+
     allow_failure: true
     variables: *variables-debian
+    artifacts:
+        reports:
+            junit: build-meson/meson-logs/testlog.junit.xml
+            coverage_report:
+                coverage_format: cobertura
+                path: cobertura.xml
+        paths:
+            - html-coverage/
+            - ${CI_PROJECT_DIR}/build-meson/meson-logs/testlog.junit.xml
 
 #
 # Snap builds


=====================================
extras/tools/SHA512SUMS
=====================================
@@ -15,5 +15,5 @@ e2a58dde1cae3e6b79c03e7ef3d888f7577c1f4cba283b3b0f31123ceea8c33d7c9700e83de57104
 d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942  help2man-1.47.6.tar.xz
 8d23dde18525dccaa648ca01df40151e7f00cec4846bd611c8970dbcfc1fb57a453facfe4d41462e7c3c8bb548d44b961a04e4fc3073ab6b65063e53f42bf6fd  nasm-2.14.tar.gz
 37b3a421419b16930e53181c431fe3b4afd55ac54733a5df08376641fd2fb88eeb73ee7abe3788f3e491e7c1b215c7f35aefa66f44b09008ad22b76ab2998830  ninja-1.11.1.tar.gz
-9b1195cfe856c1aa51bc79f6eb4d0f94925bb02d0a9fbd68a6a6ced6e5c252b09b22d9aac812640687e49b8d64a313ce48d0a69a3bf83ea8ffb8c9dab559fc23  meson-1.0.0.tar.gz
+8b5768cf0dab5f88d2f3e3962305910e707ff810cbd21b5997aab0bb6abe1c4d5dbd24ec59ab4072f1faa9b81daa8be993d56679445afa93700676f52e314d23  meson-1.2.0.tar.gz
 27acef46d9eb67203d708b57d80b853f76fa4b9c2720ff36ec161e6cdf702249e7982214ddf60bae75511aa79bc7d92aa27e3eab7ef9c0f5c040e8e42e76a385  libtool-2.4.7.tar.gz


=====================================
extras/tools/packages.mak
=====================================
@@ -51,7 +51,7 @@ GETTEXT_URL=$(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz
 HELP2MAN_VERSION=1.47.6
 HELP2MAN_URL=$(GNU)/help2man/help2man-$(HELP2MAN_VERSION).tar.xz
 
-MESON_VERSION=1.0.0
+MESON_VERSION=1.2.0
 MESON_URL=https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION)/meson-$(MESON_VERSION).tar.gz
 
 NINJA_VERSION=1.11.1



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/e9c0b18dd4c7b4fcea8b29e7c72ea79f85ea3bef...1a2a3015f3da76d404867554bb853cc03db4c415

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/e9c0b18dd4c7b4fcea8b29e7c72ea79f85ea3bef...1a2a3015f3da76d404867554bb853cc03db4c415
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance