[dvblast-devel] [Git][videolan/dvblast][master] CI: Simplify and move to contemporary builders

[Jean-Baptiste Kempf]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / dvblast


Commits:
4270dcae by Konstantin Pavlov at 2021-01-08T00:46:33+03:00
CI: Simplify and move to contemporary builders

- - - - -


1 changed file:

- .gitlab-ci.yml


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -1,34 +1,35 @@
 stages:
     - build
 
-build-debian:
-    image: registry.videolan.org:5000/vlc-debian-unstable:20181128113529
+variables:
+    LIBEV_VERSION: "4.33"
+    LIBEV_SHA256SUM: "507eb7b8d1015fbec5b935f34ebed15bf346bed04a11ab82b8eee848c4205aea"
+
+.build-template:
     stage: build
+    script: |
+        curl -O http://dist.schmorp.de/libev/Attic/libev-${LIBEV_VERSION}.tar.gz
+        echo "$LIBEV_SHA256SUM  libev-${LIBEV_VERSION}.tar.gz" | shasum -a 256 -c -
+        tar xf libev-${LIBEV_VERSION}.tar.gz
+        cd libev-${LIBEV_VERSION}
+        ./configure --prefix=`pwd`/../deps/
+        make -j $(getconf _NPROCESSORS_ONLN)
+        make install
+        cd ..
+        git clone https://code.videolan.org/videolan/bitstream
+        CFLAGS="-Ideps/include -I./" LDFLAGS="-Ldeps/lib" make -j $(getconf _NPROCESSORS_ONLN)
+
+build-debian:
+    image: registry.videolan.org/vlc-debian-unstable:20200529132440
     tags:
         - debian
         - amd64
-    script:
-        - wget http://dist.schmorp.de/libev/Attic/libev-4.24.tar.gz
-        - tar xf libev-4.24.tar.gz
-        - cd libev-4.24
-        - ./configure --prefix=`pwd`/../deps/
-        - make -j $(getconf _NPROCESSORS_ONLN)
-        - make install
-        - cd ..
-        - git clone https://code.videolan.org/videolan/bitstream
-        - CFLAGS="-Ideps/include -I./" LDFLAGS="-Ldeps/lib" make -j $(getconf _NPROCESSORS_ONLN)
+    extends:
+        - .build-template
 
 build-macos:
-    stage: build
     tags:
-        - macos
-    script:
-        - curl -sS -O http://dist.schmorp.de/libev/Attic/libev-4.24.tar.gz
-        - tar xf libev-4.24.tar.gz
-        - cd libev-4.24
-        - ./configure --prefix=`pwd`/../deps/
-        - make -j $(getconf _NPROCESSORS_ONLN)
-        - make install
-        - cd ..
-        - git clone https://code.videolan.org/videolan/bitstream
-        - CFLAGS="-Ideps/include -I./" LDFLAGS="-Ldeps/lib" make -j $(getconf _NPROCESSORS_ONLN)
+        - amd64
+        - catalina
+    extends:
+        - .build-template



View it on GitLab: https://code.videolan.org/videolan/dvblast/-/commit/4270dcae7b754b25ad27332bb1c55b6b23b85b0d

-- 
View it on GitLab: https://code.videolan.org/videolan/dvblast/-/commit/4270dcae7b754b25ad27332bb1c55b6b23b85b0d
You're receiving this email because of your account on code.videolan.org.