mirror of
https://gitlab.com/splashmapper/splash.git
synced 2026-06-16 12:33:50 +02:00
Remove CI for Ubuntu 22.04
This commit is contained in:
@@ -41,10 +41,6 @@ cache:
|
||||
variables:
|
||||
OS_NAME: debian-13
|
||||
|
||||
.ubuntu-22.04:
|
||||
variables:
|
||||
OS_NAME: ubuntu-22.04
|
||||
|
||||
.ubuntu-24.04:
|
||||
variables:
|
||||
OS_NAME: ubuntu-24.04
|
||||
@@ -92,18 +88,6 @@ cache:
|
||||
changes:
|
||||
- tools/docker/**/*
|
||||
|
||||
deps:container:ubuntu-22.04:amd64:
|
||||
extends:
|
||||
- .amd64
|
||||
- .ubuntu-22.04
|
||||
- .deps:container
|
||||
|
||||
deps:container:ubuntu-22.04:arm64:
|
||||
extends:
|
||||
- .arm64
|
||||
- .ubuntu-22.04
|
||||
- .deps:container
|
||||
|
||||
deps:container:ubuntu-24.04:amd64:
|
||||
extends:
|
||||
- .amd64
|
||||
@@ -281,27 +265,6 @@ analysis:sanitizer:
|
||||
# ┗━┓ ┃ ┣━┫┃╺┓┃┃┗┫┃╺┓
|
||||
# ┗━┛ ╹ ╹ ╹┗━┛╹╹ ╹┗━┛
|
||||
#
|
||||
staging:22.04:gcc-arm64-bundled-libs:
|
||||
stage: staging
|
||||
image: ${CI_REGISTRY_IMAGE}:ubuntu-22.04-${ARCH}
|
||||
extends:
|
||||
- .arm64
|
||||
- .ubuntu-deps
|
||||
allow_failure: true
|
||||
script:
|
||||
- ./make_deps.sh
|
||||
- rm -rf build && mkdir build
|
||||
- cmake -B build -DCMAKE_BUILD_TYPE=Debug -DPROFILE=ON -DCMAKE_INSTALL_PREFIX=/usr
|
||||
- make -sC build -j$(nproc)
|
||||
- make check -sC build
|
||||
- make package -sC build
|
||||
- make -sC build install
|
||||
- ./build/src/splash --info
|
||||
- xvfb-run --auto-servernum --server-args='-screen 0 1920x1080x24' ./build/src/splash --child --prefix unittest local &
|
||||
- xvfb-run --auto-servernum --server-args='-screen 0 1920x1080x24' ./build/src/splash --doNotSpawn --prefix unittest ./data/share/splash/splash.json
|
||||
rules:
|
||||
- if: $CI_COMMIT_BRANCH == 'staging'
|
||||
|
||||
staging:24.04:gcc-amd64-system-libs:
|
||||
stage: staging
|
||||
image: ${CI_REGISTRY_IMAGE}:ubuntu-24.04-${ARCH}
|
||||
@@ -516,41 +479,6 @@ staging:windows:
|
||||
# ╹ ╹ ╹┗━╸╹ ╹╹ ╹┗━┛┗━╸
|
||||
#
|
||||
|
||||
#
|
||||
# Ubuntu 22.04
|
||||
#
|
||||
.package:ubuntu:22.04:
|
||||
stage: package
|
||||
image: ${CI_REGISTRY_IMAGE}:ubuntu-22.04-${ARCH}
|
||||
extends:
|
||||
- .ubuntu-deps
|
||||
script:
|
||||
# Build package
|
||||
- ./make_deps.sh
|
||||
- rm -rf build && mkdir build && cd build
|
||||
- cmake -DBUILD_GENERIC_ARCH=ON -DWITH_LTO=ON -DCMAKE_INSTALL_PREFIX=/usr -DUSE_SYSTEM_LIBS=ON ..
|
||||
- make -j$(nproc)
|
||||
- make package
|
||||
- mv *.deb ../
|
||||
artifacts:
|
||||
name: "splash_${CI_COMMIT_REF_NAME}"
|
||||
paths:
|
||||
- "*.deb"
|
||||
expire_in: never
|
||||
rules:
|
||||
- if: $CI_COMMIT_TAG =~ /^\d+\.\d+\.\d+$/
|
||||
- if: $CI_COMMIT_BRANCH == 'master'
|
||||
|
||||
package:ubuntu:22.04:amd64:
|
||||
extends:
|
||||
- .package:ubuntu:22.04
|
||||
- .amd64
|
||||
|
||||
package:ubuntu:22.04:arm64:
|
||||
extends:
|
||||
- .package:ubuntu:22.04
|
||||
- .arm64
|
||||
|
||||
#
|
||||
# Ubuntu 24.04
|
||||
#
|
||||
|
||||
+1
-1
@@ -318,7 +318,7 @@ The CI pipeline is configured in the file `./.gitlab-ci.yml`, see the [official
|
||||
|
||||
Not all jobs are executed everytime. At minimum, a merge request must be created to have the test stages running. The following stages are executed only when staging and releasing Splash.
|
||||
|
||||
The built Docker images are for Ubuntu 22.04 and 24.04, for AMD64 and ARM64 platforms. They are built once and are not rebuilt unless the docker files, located in `./tools/docker` are modified.
|
||||
The built Docker images are for Ubuntu 24.04 and 26.04, for AMD64 and ARM64 platforms. They are built once and are not rebuilt unless the docker files, located in `./tools/docker` are modified.
|
||||
|
||||
Lastly, tags are used to know which job to run on each platform. AMD64 runners must have the `amd64` tag, and ARM64 platforms must have the `arm64` tag. And all platforms must run in privileged mode, to allow for Docker image generation inside Docker. See the [Gitlab documentation related to this](https://docs.gitlab.com/ee/ci/docker/using_docker_build.html). To ensure that this has been taken into consideration, a `privileged` tag is also added to all runners.
|
||||
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
FROM ubuntu:22.04 as build
|
||||
LABEL MAINTAINER Emmanuel Durand <manu@lab148.xyz>
|
||||
|
||||
RUN apt update -qq && apt upgrade -y \
|
||||
&& DEBIAN_FRONTEND=noninterative apt install -y --no-install-recommends \
|
||||
ca-certificates ccache wget curl build-essential clang clang-tools \
|
||||
doxygen flatpak-builder git-core git-lfs libjsoncpp-dev zip cmake \
|
||||
cmake-extras automake lcov libtool libxcb-shm0-dev libxrandr-dev \
|
||||
libxi-dev libglm-dev libgsl0-dev libatlas3-base libgphoto2-dev \
|
||||
libxinerama-dev libxcursor-dev python3-dev portaudio19-dev yasm \
|
||||
libgl1-mesa-dev libopencv-dev software-properties-common uuid-dev \
|
||||
libavcodec-dev libavformat-dev libavutil-dev libswscale-dev \
|
||||
libsnappy-dev libzmq3-dev libwayland-dev libxkbcommon-dev ninja-build \
|
||||
pkg-config zip xvfb glslang-tools glslang-dev mold liblo-dev
|
||||
Reference in New Issue
Block a user