[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: CI: don't expect a Windows -debug package

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC


Commits:
5d532c2b by Steve Lhomme at 2024-11-25T07:51:47+01:00
CI: don't expect a Windows -debug package

It's gone since 04d7d5c32f16fd1fa4e8535ac02b79149f28a527

(cherry picked from commit 5b0a0d2b39b7054a2044e81988fc9c196549d6af) (edited)
edited:
- it's gone since bb0f4f968d7f2e719c1f76124ec58bb39bce6280

- - - - -
f87307ef by Steve Lhomme at 2024-11-25T08:50:58+01:00
CI: add a VLCARCH variable for Windows targets

The build folder doesn't always correspond to the arch, for example it may contain
ucrt.

(cherry picked from commit f2afde1e1406bb31d26adfe727a0ff4cea706a1a) (edited)
edited:
- 3.0 doesn't build code from doc/
- 3.0 has less Windows targets

- - - - -


1 changed file:

- extras/ci/gitlab-ci.yml


Changes:

=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -31,16 +31,19 @@ variables:
 
 .variables-win32: &variables-win32
         SHORTARCH: win32
+        VLCARCH: win32
         HOST_ARCH: i686
         TRIPLET: $HOST_ARCH-w64-mingw32
 
 .variables-win64: &variables-win64
         SHORTARCH: win64
+        VLCARCH: win64
         HOST_ARCH: x86_64
         TRIPLET: $HOST_ARCH-w64-mingw32
 
 .variables-win64-arm: &variables-win64-arm
         SHORTARCH: arm64
+        VLCARCH: winarm64
         HOST_ARCH: aarch64
         TRIPLET: $HOST_ARCH-w64-mingw32
 
@@ -130,6 +133,7 @@ win64-arm-llvm:
         name: $VLC_WIN_LLVM_UCRT_IMAGE
     variables:
         <<: *variables-win64-arm
+        VLCARCH: winarm64-ucrt
         UWP_EXTRA_BUILD_FLAGS: -u -x -S 0x0A000006
         # Clang <= 15 produces incorrect unwind info for code with
         # branch protection enabled on Windows.
@@ -141,6 +145,7 @@ uwp64-libvlc-llvm:
         name: $VLC_UWP_LLVM_IMAGE
     variables:
         <<: *variables-win64
+        VLCARCH: win64-uwp
         LIBVLC_EXTRA_BUILD_FLAGS: -z
         UWP_EXTRA_BUILD_FLAGS: -u -w
 
@@ -151,8 +156,8 @@ uwp64-libvlc-llvm:
     except:
     after_script:
         - mkdir nightlies
-        - for ext in 7z zip; do mv ${SHORTARCH}/vlc-*-debug.${ext} nightlies/$(basename ${SHORTARCH}/vlc-*-debug.${ext} | sed "s/\.${ext}/-${CI_COMMIT_SHORT_SHA}\.${ext}/"); done
-        - for ext in exe msi 7z zip; do mv ${SHORTARCH}/vlc-*.${ext} nightlies/$(basename ${SHORTARCH}/vlc-*.${ext} | sed "s/\.${ext}/-${CI_COMMIT_SHORT_SHA}\.${ext}/"); done
+        - for ext in 7z;             do mv ${VLCARCH}/vlc-*-debug.${ext} nightlies/$(basename ${VLCARCH}/vlc-*-debug.${ext} | sed "s/\.${ext}/-${CI_COMMIT_SHORT_SHA}\.${ext}/"); done
+        - for ext in exe msi 7z zip; do mv ${VLCARCH}/vlc-*.${ext}       nightlies/$(basename ${VLCARCH}/vlc-*.${ext}       | sed "s/\.${ext}/-${CI_COMMIT_SHORT_SHA}\.${ext}/"); done
         - cd nightlies && find . -maxdepth 1 -type f -not -name SHA512SUM | xargs shasum -a 512 | tee SHA512SUM
     artifacts:
         paths:



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/f2a4147eb89e8d7f36585e4840851a81a9a7abc8...f87307ef33f59d02e222686d493e2ecbff2873fa

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


VideoLAN code repository instance