[vlc-commits] [Git][videolan/vlc][master] 2 commits: ci: explicitly use names with C runtime for mingw64 LLVM targets

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
9d21973d by Steve Lhomme at 2022-10-04T04:39:17+00:00
ci: explicitly use names with C runtime for mingw64 LLVM targets

- - - - -
fb68177d by Steve Lhomme at 2022-10-04T04:39:17+00:00
ci: use mingw64 LLVM 13 images

The names of the images have changed to reflect their specificity. In this case
only the C runtime (and minimum Windows version) is different.

- - - - -


1 changed file:

- extras/ci/gitlab-ci.yml


Changes:

=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -21,8 +21,8 @@ default:
 variables:
     VLC_WIN32_IMAGE: registry.videolan.org/vlc-debian-win32:20220505170026
     VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64:20220505172436
-    VLC_WIN_LLVM_IMAGE: registry.videolan.org/vlc-debian-llvm-mingw:20220705072259
-    VLC_UWP_LLVM_IMAGE: registry.videolan.org/vlc-debian-llvm-uwp:20220713124227
+    VLC_WIN_LLVM_MSVCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-msvcrt:20220929111544
+    VLC_WIN_LLVM_UCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-ucrt:20220929134817
     VLC_DEBIAN_IMAGE: registry.videolan.org/vlc-debian-unstable:20220720135244
     VLC_ANDROID_IMAGE: registry.videolan.org/vlc-debian-android:20220728132611
     VLC_SNAP_IMAGE: registry.videolan.org/vlc-ubuntu-focal:20220810081944
@@ -161,13 +161,13 @@ win64:
 win64-llvm:
     extends: .win-common
     image:
-        name: $VLC_WIN_LLVM_IMAGE
+        name: $VLC_WIN_LLVM_MSVCRT_IMAGE
     variables: *variables-win64
 
 win64-arm-llvm:
     extends: .win-common
     image:
-        name: $VLC_UWP_LLVM_IMAGE
+        name: $VLC_WIN_LLVM_UCRT_IMAGE
     variables:
         <<: *variables-win64-arm
         LIBVLC_EXTRA_BUILD_FLAGS: -z
@@ -176,7 +176,7 @@ win64-arm-llvm:
 uwp64-libvlc-llvm:
     extends: .win-common
     image:
-        name: $VLC_UWP_LLVM_IMAGE
+        name: $VLC_WIN_LLVM_UCRT_IMAGE
     variables:
         <<: *variables-win64
         LIBVLC_EXTRA_BUILD_FLAGS: -z
@@ -210,13 +210,13 @@ nightly-win64:
 nightly-win64-llvm:
     extends: .nightly-win-common
     image:
-        name: $VLC_WIN_LLVM_IMAGE
+        name: $VLC_WIN_LLVM_MSVCRT_IMAGE
     variables: *variables-win64
 
 nightly-win64-ucrt-llvm:
     extends: .nightly-win-common
     image:
-        name: $VLC_UWP_LLVM_IMAGE
+        name: $VLC_WIN_LLVM_UCRT_IMAGE
     variables:
         <<: *variables-win64
         TRIPLET: $HOST_ARCH-ucrt-w64-mingw32



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/5d4b467ae8afddbe5318a328098e71c851bd1905...fb68177d8e1ae1394f660217e1bcd8ca3e9153ec

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


VideoLAN code repository instance