Skip to content

Commit ef60e16

Browse files
authored
Update build-deps to Ubuntu Noble (#1540)
1 parent 5158e1a commit ef60e16

3 files changed

Lines changed: 32 additions & 5 deletions

File tree

.CI/cache/Dockerfile

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
# Cannot be parametrized in Jenkins...
2-
FROM docker.openmodelica.org/build-deps:v1.22.2
2+
FROM ghcr.io/openmodelica/build-deps:v1.26.0
33

4-
# We don't know the uid of the user who will build, so make the /cache directories world writable
5-
6-
RUN apt update && apt install -y libasan6 libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev && \
7-
mkdir -p /cache/runtest/ /cache/omlibrary/ && chmod ugo+rwx /cache/runtest/ /cache/omlibrary/
4+
# We don't know the uid of the user who will build, so make the /cache
5+
# directories world writable
6+
RUN apt-get update \
7+
&& apt-get install -y \
8+
libasan6 \
9+
libxcursor-dev \
10+
libxi-dev \
11+
libxinerama-dev \
12+
libxrandr-dev \
13+
&& mkdir -p /cache/runtest/ /cache/omlibrary/ \
14+
&& chmod ugo+rwx /cache/runtest/ /cache/omlibrary/

Jenkinsfile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,24 @@ pipeline {
6464
stash name: 'docs', includes: "install/share/doc/**"
6565
}
6666
}
67+
stage('linux64-focal') {
68+
agent {
69+
docker {
70+
image 'docker.openmodelica.org/build-deps:v1.22.2'
71+
label 'linux'
72+
alwaysPull true
73+
}
74+
}
75+
environment {
76+
HOME = "/tmp/"
77+
}
78+
steps {
79+
buildOMS()
80+
sh '(cd install/ && tar czf "../OMSimulator-linux-focal-amd64-`git describe --tags --abbrev=7 --match=v*.* --exclude=*-dev | sed \'s/-/.post/\'`.tar.gz" *)'
81+
82+
archiveArtifacts artifacts: 'OMSimulator-linux-focal-amd64-*.tar.gz', fingerprint: true
83+
}
84+
}
6785
stage('linux64-asan') {
6886
stages {
6987
stage('build-asan') {

testsuite/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# generated files
22
/*.log
3+
*.fail_log
4+
*.test_log

0 commit comments

Comments
 (0)