Skip to content

Commit

Permalink
Bump build-deps to v1.22.2 (#11509)
Browse files Browse the repository at this point in the history
- Adding bison to fix Jenkins stage testsuite-clang-metamodelica
  • Loading branch information
AnHeuermann committed Nov 6, 2023
1 parent 92a2070 commit 22a21ef
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .CI/cache/Dockerfile
@@ -1,5 +1,5 @@
# Cannot be parametrized in Jenkins...
FROM docker.openmodelica.org/build-deps:v1.22.1
FROM docker.openmodelica.org/build-deps:v1.22.2

# We don't know the uid of the user who will build, so make the /cache directories world writable

Expand Down
2 changes: 1 addition & 1 deletion .CI/cmake/Jenkinsfile.cmake.ubuntu.gcc.test
Expand Up @@ -25,7 +25,7 @@ pipeline {
stage('autoconf-jammy-gcc') {
agent {
docker {
image 'docker.openmodelica.org/build-deps:v1.22.1'
image 'docker.openmodelica.org/build-deps:v1.22.2'
label 'linux'
alwaysPull true
args "--mount type=volume,source=omlibrary-cache,target=/cache/omlibrary " +
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/build-deps-v1.22/devcontainer.json
Expand Up @@ -10,7 +10,7 @@
"build": {
"dockerfile": "Dockerfile",
"args": {
"BASE_IMAGE": "docker.openmodelica.org/build-deps:v1.22.1",
"BASE_IMAGE": "docker.openmodelica.org/build-deps:v1.22.2",
// On Windows USERNAME is set, on Linux USER is set
// We hope only one is set
"USERNAME": "${localEnv:USER}${localEnv:USERNAME}"
Expand Down
24 changes: 12 additions & 12 deletions Jenkinsfile
Expand Up @@ -55,7 +55,7 @@ pipeline {
stage('gcc') {
agent {
docker {
image 'docker.openmodelica.org/build-deps:v1.22.1'
image 'docker.openmodelica.org/build-deps:v1.22.2'
label 'linux'
alwaysPull true
args "--mount type=volume,source=omlibrary-cache,target=/cache/omlibrary " +
Expand All @@ -73,7 +73,7 @@ pipeline {
stage('clang') {
agent {
docker {
image 'docker.openmodelica.org/build-deps:v1.22.1'
image 'docker.openmodelica.org/build-deps:v1.22.2'
label 'linux'
alwaysPull true
args "--mount type=volume,source=omlibrary-cache,target=/cache/omlibrary " +
Expand Down Expand Up @@ -199,7 +199,7 @@ pipeline {
stage('checks') {
agent {
docker {
image 'docker.openmodelica.org/build-deps:v1.22.1'
image 'docker.openmodelica.org/build-deps:v1.22.2'
label 'linux'
alwaysPull true
args "--mount type=volume,source=omlibrary-cache,target=/cache/omlibrary " +
Expand Down Expand Up @@ -477,7 +477,7 @@ pipeline {
stage('build-gui-clang-qt5') {
agent {
docker {
image 'docker.openmodelica.org/build-deps:v1.22.1'
image 'docker.openmodelica.org/build-deps:v1.22.2'
label 'linux'
alwaysPull true
args "--mount type=volume,source=omlibrary-cache,target=/cache/omlibrary"
Expand Down Expand Up @@ -534,7 +534,7 @@ pipeline {
stage('testsuite-clang-parmod') {
agent {
docker {
image 'docker.openmodelica.org/build-deps:v1.22.1'
image 'docker.openmodelica.org/build-deps:v1.22.2'
label 'linux-intel-x64' // TODO: We didn't get OpenCL to work on AMD CPU on Ubuntu Jammy, so Intel it is
alwaysPull true
// No runtest.db cache necessary; the tests run in serial and do not load libraries!
Expand All @@ -556,7 +556,7 @@ pipeline {
stage('testsuite-clang-metamodelica') {
agent {
docker {
image 'docker.openmodelica.org/build-deps:v1.22.1'
image 'docker.openmodelica.org/build-deps:v1.22.2'
label 'linux'
}
}
Expand All @@ -574,7 +574,7 @@ pipeline {
stage('testsuite-matlab-translator') {
agent {
docker {
image 'docker.openmodelica.org/build-deps:v1.22.1'
image 'docker.openmodelica.org/build-deps:v1.22.2'
label 'linux'
alwaysPull true
}
Expand All @@ -596,7 +596,7 @@ pipeline {
stage('test-clang-icon-generator') {
agent {
docker {
image 'docker.openmodelica.org/build-deps:v1.22.1'
image 'docker.openmodelica.org/build-deps:v1.22.2'
label 'linux'
args "--mount type=volume,source=runtest-clang-icon-generator,target=/cache/runtest " +
"--mount type=volume,source=omlibrary-cache,target=/cache/omlibrary " +
Expand Down Expand Up @@ -732,7 +732,7 @@ pipeline {
stage('clang-qt5-omedit-testsuite') {
agent {
docker {
image 'docker.openmodelica.org/build-deps:v1.22.1'
image 'docker.openmodelica.org/build-deps:v1.22.2'
label 'linux'
alwaysPull true
args "--mount type=volume,source=omlibrary-cache,target=/cache/omlibrary"
Expand All @@ -755,7 +755,7 @@ pipeline {
stage('fmuchecker-results') {
agent {
docker {
image 'docker.openmodelica.org/build-deps:v1.22.1'
image 'docker.openmodelica.org/build-deps:v1.22.2'
label 'linux'
alwaysPull true
}
Expand Down Expand Up @@ -783,7 +783,7 @@ pipeline {
stage('upload-compliance') {
agent {
docker {
image 'docker.openmodelica.org/build-deps:v1.22.1'
image 'docker.openmodelica.org/build-deps:v1.22.2'
label 'linux'
alwaysPull true
}
Expand All @@ -801,7 +801,7 @@ pipeline {
stage('upload-doc') {
agent {
docker {
image 'docker.openmodelica.org/build-deps:v1.22.1'
image 'docker.openmodelica.org/build-deps:v1.22.2'
label 'linux'
alwaysPull true
}
Expand Down

0 comments on commit 22a21ef

Please sign in to comment.