Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
D
DP3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ResearchAndDevelopment
DP3
Merge requests
!1267
AST-1553
Remove IDG from Ubuntu 20 build; Add Ubuntu 24 build
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
AST-1553
Remove IDG from Ubuntu 20 build; Add Ubuntu 24 build
ast-1553-use-ubuntu-24
into
master
Overview
5
Commits
8
Pipelines
12
Changes
3
Merged
Maik Nijhuis
requested to merge
ast-1553-use-ubuntu-24
into
master
9 months ago
Overview
5
Commits
8
Pipelines
12
Changes
1
Expand
Since IDG no longer supports Ubuntu 20 (it uses CMake 3.17, while Ubuntu 20 has CMake 3.16), remove it from the Ubuntu 20 CI build.
Add a basic Ubuntu 24 build on CI.
Edited
9 months ago
by
Maik Nijhuis
0
0
Merge request reports
Compare
version 1
version 10
9328418f
9 months ago
version 9
dd3874a0
9 months ago
version 8
5dec02b7
9 months ago
version 7
3f109f5d
9 months ago
version 6
af35357b
9 months ago
version 5
fcc4ad5f
9 months ago
version 4
4f61aa04
9 months ago
version 3
a4214299
9 months ago
version 2
619522a2
9 months ago
version 1
7b70af06
9 months ago
master (base)
and
version 2
latest version
5f633309
8 commits,
9 months ago
version 10
9328418f
8 commits,
9 months ago
version 9
dd3874a0
7 commits,
9 months ago
version 8
5dec02b7
6 commits,
9 months ago
version 7
3f109f5d
5 commits,
9 months ago
version 6
af35357b
5 commits,
9 months ago
version 5
fcc4ad5f
4 commits,
9 months ago
version 4
4f61aa04
3 commits,
9 months ago
version 3
a4214299
2 commits,
9 months ago
version 2
619522a2
1 commit,
9 months ago
version 1
7b70af06
1 commit,
9 months ago
Show latest version
1 file
+
2
−
2
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
.gitlab-ci.common.yml
+
30
−
34
Options
@@ -39,6 +39,7 @@ versioning:
-
git fetch --unshallow
-
echo BASE_IMAGE_2004=${CI_REGISTRY_IMAGE}/base_ubuntu20:$(git log -n 1 --pretty=format:%H -- docker/ubuntu_20_04_base) > versions.env
-
echo BASE_IMAGE_2204=${CI_REGISTRY_IMAGE}/base_ubuntu22:$(git log -n 1 --pretty=format:%H -- docker/ubuntu_22_04_base) >> versions.env
-
echo BASE_IMAGE_2404=${CI_REGISTRY_IMAGE}/base_ubuntu24:$(git log -n 1 --pretty=format:%H -- docker/ubuntu_24_04_base) >> versions.env
-
cat versions.env
artifacts
:
reports
:
@@ -74,58 +75,53 @@ versioning:
# - $DOCKER_FILE
# Create and push the base image to the gitlab registry, if it does not exist.
prepare-base-2004
:
extends
:
.prepare
variables
:
DOCKER_IMAGE
:
$BASE_IMAGE_2004
DOCKER_FILE
:
./docker/ubuntu_20_04_base
prepare-base-2204
:
extends
:
.prepare
variables
:
DOCKER_IMAGE
:
$BASE_IMAGE_2204
DOCKER_FILE
:
./docker/ubuntu_22_04_base
# Template for jobs that depend on the optional prepare-base job.
.needs-base-2204
:
needs
:
-
job
:
versioning
-
job
:
prepare-base-2204
optional
:
true
image
:
$BASE_IMAGE_2204
prepare-2004
:
prepare-base-2404
:
extends
:
.prepare
variables
:
DOCKER_IMAGE
:
$BASE_IMAGE_2
0
04
DOCKER_FILE
:
./docker/ubuntu_2
0
_04_base
DOCKER_IMAGE
:
$BASE_IMAGE_2
4
04
DOCKER_FILE
:
./docker/ubuntu_2
4
_04_base
build-2004
:
stage
:
build
# Template for basic build jobs.
.build-basic
:
extends
:
.failable
needs
:
-
job
:
versioning
-
job
:
prepare-2004
optional
:
true
image
:
$BASE_IMAGE_2004
stage
:
build
script
:
# Build and run DP3
-
mkdir build
-
cd build
-
cmake -G Ninja -DBUILD_TESTING=On ..
-
ninja install
-
DP3
build-no-idg-2204
:
stage
:
build
extends
:
[
"
.failable"
,
"
.needs-base-2204"
]
before_script
:
-
rm -r /usr/lib/cmake/*idg*
-
rm -r /usr/lib/cmake/*IDGAPITargets*
-
rm -r /usr/lib/*idg*
-
rm -rf /usr/include/idg-*
script
:
-
mkdir build
-
cd build
-
cmake -G Ninja ..
-
ninja
# Build (and run) DP3 on Ubuntu 20, ensuring backward compatiblity.
# This build does not include IDG, since IDG no longer supports Ubuntu 20.
build-2004-no-idg
:
extends
:
.build-basic
needs
:
[
"
versioning"
,
"
prepare-base-2004"
]
image
:
$BASE_IMAGE_2004
# Build (and run) DP3 on Ubuntu 24, ensuring compatibility with new systems.
build-2404
:
extends
:
.build-basic
needs
:
[
"
versioning"
,
"
prepare-base-2404"
]
image
:
$BASE_IMAGE_2404
# Template for jobs that depend on prepare-base-2204.
.needs-base-2204
:
needs
:
[
"
versioning"
,
"
prepare-base-2204"
]
image
:
$BASE_IMAGE_2204
# Build debug has no needs entry because it can have either a base
# image from build-base or build-base-ska which is determined on runtime
build-debug-2204
:
stage
:
build
extends
:
[
"
.failable"
,
"
.needs-base-2204"
]
Loading