[vlc-commits] [Git][videolan/vlc][master] 2 commits: CI: Remove unrequired docker template

[Hugo Beauzée-Luyssen (@chouquette)]

Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC


Commits:
53f64525 by Hugo Beauzée-Luyssen at 2022-02-25T07:11:28+00:00
CI: Remove unrequired docker template

Use a default and let the non-docker jobs specify their own tags as they
already did

- - - - -
07f09369 by Hugo Beauzée-Luyssen at 2022-02-25T07:11:28+00:00
CI: Use rules instead of only/except

rules allow finer customizations, and only/except is to be considered
deprecated according to gitlab docs

- - - - -


1 changed file:

- extras/ci/gitlab-ci.yml


Changes:

=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -12,6 +12,11 @@ default:
         - mv contrib/vlc-contrib-*.tar.bz2 contrib/vlc-contrib-${TRIPLET}-${VLC_CONTRIB_SHA}.tar.bz2 2>/dev/null || true
         - cd contrib && find . -maxdepth 1 -type f -name "vlc-contrib-*-${VLC_CONTRIB_SHA}.tar.bz2" -exec sh -c 'tar tf "$0" > /dev/null && shasum -a 512 "$0" | tee SHA512SUM' "{}" \;
     interruptible: true
+    # Most jobs use docker, so we can default to those tags.
+    # macOS base template will overwrite this
+    tags:
+        - docker
+        - amd64
 
 variables:
     VLC_WIN32_IMAGE: registry.videolan.org/vlc-debian-win32:20201106141924
@@ -112,29 +117,19 @@ variables:
 # Common rules
 .base-template:
     stage: build
-    only:
-        refs:
-            - merge_requests
-            - master at videolan/vlc
-    except:
-        - schedules
+    rules:
+        - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+        - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "master at videolan/vlc"'
     artifacts:
         paths:
             - contrib/vlc-contrib-${TRIPLET}-*.tar.bz2
             - contrib/SHA512SUM
 
-# Common rules for jobs using docker
-.docker-template:
-    extends: .base-template
-    tags:
-        - docker
-        - amd64
-
 #
 # Windows
 #
 .win-common:
-    extends: .docker-template
+    extends: .base-template
     script: |
         if [ "${CI_JOB_NAME:0:8}" = "nightly-" ]; then
             NIGHTLY_EXTRA_BUILD_FLAGS="-i n -l"
@@ -193,9 +188,8 @@ uwp-arm64-libvlc-llvm:
 
 .nightly-win-common:
     extends: .win-common
-    only:
-        - schedules
-    except:
+    rules:
+        - if: '$CI_PIPELINE_SOURCE == "schedule"'
     after_script:
         - mkdir nightlies
         - for ext in 7z zip; do mv ${SHORTARCH}/vlc-*-dev-*-debug.${ext} nightlies/$(basename ${SHORTARCH}/vlc-*-dev-*-debug.${ext} | sed "s/\.${ext}/-${CI_COMMIT_SHORT_SHA}\.${ext}/"); done
@@ -236,7 +230,7 @@ nightly-win64-ucrt-llvm:
 # Debian
 #
 debian:
-    extends: .docker-template
+    extends: .base-template
     image:
         name: $VLC_DEBIAN_IMAGE
     script: |
@@ -280,9 +274,8 @@ debian:
 
 nightly-debian:
     extends: debian
-    only:
-        - schedules
-    except:
+    rules:
+        - if: '$CI_PIPELINE_SOURCE == "schedule"'
     after_script:
     artifacts:
 
@@ -290,7 +283,7 @@ nightly-debian:
 # Snap builds
 #
 .snap-common:
-    extends: .docker-template
+    extends: .base-template
     image:
         name: $VLC_SNAP_IMAGE
     script: |
@@ -306,9 +299,8 @@ snap:
 
 nightly-snap:
     extends: .snap-common
-    only:
-        - schedules
-    except:
+    rules:
+        - if: '$CI_PIPELINE_SOURCE == "schedule"'
     after_script:
         - if [ "$CI_PROJECT_NAMESPACE" = "videolan" ]; then /bin/true; else exit 0; fi
         - mkdir nightlies
@@ -325,7 +317,7 @@ nightly-snap:
 # Raspbian
 #
 raspbian-arm:
-    extends: .docker-template
+    extends: .base-template
     image:
         name: $VLC_RASPBIAN_IMAGE
     script: |
@@ -397,9 +389,8 @@ macos-arm64:
 
 .nightly-macos-common:
     extends: .macos-common
-    only:
-        - schedules
-    except:
+    rules:
+        - if: '$CI_PIPELINE_SOURCE == "schedule"'
     after_script:
         - mkdir nightlies
         - mv build/vlc-*.dmg nightlies/$(basename build/vlc-*.dmg | sed "s/\.dmg/-${SHORTARCH}-${CI_COMMIT_SHORT_SHA}\.dmg/")
@@ -454,7 +445,7 @@ tvos-arm64:
 # Android
 #
 .android-common:
-    extends: .docker-template
+    extends: .base-template
     image:
         name: $VLC_ANDROID_IMAGE
     script: |
@@ -486,7 +477,7 @@ android-x86_64:
 #
 
 wasm32-emscripten-build :
-    extends: .docker-template
+    extends: .base-template
     variables: *variables-emscripten-wasm32
     image:
         name: $VLC_WASM_EMSCRIPTEN
@@ -503,7 +494,7 @@ wasm32-emscripten-build :
 # VLC Documentation
 #
 pages:
-    extends: .docker-template
+    extends: .base-template
     image:
         name: $VLC_DEBIAN_IMAGE
     script:
@@ -514,6 +505,5 @@ pages:
     artifacts:
         paths:
             - public
-    only:
-        - schedules
-    except:
+    rules:
+        - if: '$CI_PIPELINE_SOURCE == "schedule"'



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/77b7527379623c163000f2c2a85001d63b3e8467...07f0936971627bca0bbe0e259703c0dfe099f11b

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


VideoLAN code repository instance