From 3446dd669309655ab30af91660a9adb16793c019 Mon Sep 17 00:00:00 2001
From: Petter Reinholdtsen <pere@debian.org>
Date: Fri, 7 Mar 2025 15:30:23 +0100
Subject: [PATCH] Updated gitlab CI run to newer gcc/debian and check clang and
subdir build.
---
.gitlab-ci.yml | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 40 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d5bb591c..bac0be65 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,27 +2,62 @@ default:
tags:
- docker
# Image from https://hub.docker.com/_/gcc/ based on Debian
- image: gcc:9
+ image: gcc:14
-autotools:
+.autoconf:
stage: build
before_script:
- apt-get update &&
apt-get install -y libogg-dev libvorbis-dev
- libsdl-dev libpng-dev libtiff-dev
+ libsdl1.2-dev libpng-dev libtiff-dev
doxygen fig2dev texlive texlive-latex-extra
+ ${INSTALL_COMPILER} ${INSTALL_EXTRA}
script:
- ./autogen.sh
- - ./configure
+ - ./configure ${CONFIG_FLAGS} || cat config.log
+ - make
+ - make check
+ variables:
+ INSTALL_COMPILER: gcc g++
+
+autotools-gcc:
+ extends: .autoconf
+ script:
+ - ./autogen.sh
+ - ./configure ${CONFIG_FLAGS}
+ - make
+ - make distcheck
+ artifacts:
+ paths:
+ - libtheora-*.tar.gz
+ expire_in: 2 week
+
+autotools-gcc-builddir:
+ extends: .autoconf
+ script:
+ - ./autogen.sh
+ - mkdir build
+ - (cd build && ../configure ${CONFIG_FLAGS})
+ - (cd build && make)
+ - (cd build && make check)
+
+autotools-clang:
+ extends: .autoconf
+ script:
+ - ./autogen.sh
+ - ./configure ${CONFIG_FLAGS}
- make
- make distcheck
+ variables:
+ INSTALL_COMPILER: clang
+ CC: clang
scons:
stage: build
before_script:
- apt-get update &&
apt-get install -y libogg-dev libvorbis-dev
- libsdl-dev libpng-dev libtiff-dev
+ libsdl1.2-dev libpng-dev libtiff-dev
scons
script:
- scons
--
GitLab