[x264-devel] [Git][videolan/x264][master] 2 commits: CI: Add config.log to job artifacts

[Anton Mitrofanov (@BugMaster)]

Anton Mitrofanov pushed to branch master at VideoLAN / x264


Commits:
ea08f586 by Anton Mitrofanov at 2024-02-28T23:19:23+03:00
CI: Add config.log to job artifacts

- - - - -
7241d020 by Anton Mitrofanov at 2024-02-28T23:23:15+03:00
CI: Switch 32/64-bit windows builds to LLVM

Use same Docker images as VLC for contrib compilation.

- - - - -


1 changed file:

- .gitlab-ci.yml


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -17,13 +17,13 @@ stages:
     _TRIPLET: "i686-w64-mingw32"
     _PLATFORMSUFFIX: ".exe"
     _WRAPPER: "wine"
-    _CONTRIB_URL: "https://artifacts.videolan.org/vlc/win32/"
+    _CONTRIB_URL: "https://artifacts.videolan.org/vlc/win32-llvm/"
 
 .variables-win64: &variables-win64
     _TRIPLET: "x86_64-w64-mingw32"
     _PLATFORMSUFFIX: ".exe"
     _WRAPPER: "wine"
-    _CONTRIB_URL: "https://artifacts.videolan.org/vlc/win64/"
+    _CONTRIB_URL: "https://artifacts.videolan.org/vlc/win64-llvm/"
 
 .variables-win-armv7: &variables-win-armv7
     _TRIPLET: "armv7-w64-mingw32"
@@ -79,11 +79,12 @@ stages:
             - x264${_PLATFORMSUFFIX}
             - checkasm8${_PLATFORMSUFFIX}
             - checkasm10${_PLATFORMSUFFIX}
+            - config.log
         expire_in: 1 week
 
 build-debian-amd64:
     extends: .build
-    image: registry.videolan.org/x264-debian-unstable:20231113190916
+    image: registry.videolan.org/vlc-debian-unstable:20240212151604
     tags:
         - docker
         - amd64
@@ -99,9 +100,11 @@ build-debian-aarch64:
 
 .build-win:
     extends: build-debian-amd64
+    image: registry.videolan.org/vlc-debian-llvm-msvcrt:20240212151604
     script: |
         set -x
         LOCAL_INSTALL_DIR=`pwd`/${_TRIPLET}
+        export PKGCONFIG=pkg-config
         export PKG_CONFIG_LIBDIR=${LOCAL_INSTALL_DIR}/lib/pkgconfig
         curl -f -o vlc-contrib.txt ${_CONTRIB_URL}
         CONTRIB_NAME=$(sed -n -e "s at .*href=\"\(vlc-contrib-${_TRIPLET}-[^\"]*\.tar\.bz2\)\".*@\1 at p" vlc-contrib.txt | sed -n -e '1p')
@@ -128,7 +131,7 @@ build-win64:
 
 .build-llvm-mingw:
     extends: .build
-    image: registry.videolan.org/vlc-debian-llvm-mingw:20211020094514
+    image: registry.videolan.org/vlc-debian-llvm-ucrt:20240212151604
     tags:
         - docker
         - amd64
@@ -228,6 +231,7 @@ test-macos-x86_64:
 test-aarch64-qemu:
     <<: *test
     extends: build-debian-amd64
+    image: registry.videolan.org/x264-debian-unstable:20231113190916
     dependencies:
         - build-debian-aarch64
     variables: *variables-debian-amd64



View it on GitLab: https://code.videolan.org/videolan/x264/-/compare/12426f5f4906e34d483a07da0debb6d56c6f8434...7241d020118bb09cc0ad119d7bc9f630a1caad10

-- 
View it on GitLab: https://code.videolan.org/videolan/x264/-/compare/12426f5f4906e34d483a07da0debb6d56c6f8434...7241d020118bb09cc0ad119d7bc9f630a1caad10
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance