@@ -24,8 +24,8 @@ OC_UBUNTU = "owncloud/ubuntu:20.04"
24
24
# Eventually, we have to use image built on ubuntu
25
25
# Todo: update or remove the following images
26
26
# https://github.com/owncloud/client/issues/10070
27
- OC_CI_CLIENT_FEDORA = "owncloudci/client:fedora-38 -amd64"
28
- OC_CI_SQUISH = "owncloudci/squish:fedora-38 -7.1 .1-qt64x -linux64"
27
+ OC_CI_CLIENT_FEDORA = "owncloudci/client:fedora-39 -amd64"
28
+ OC_CI_SQUISH = "owncloudci/squish:fedora-39 -7.2 .1-qt66x -linux64"
29
29
30
30
PLUGINS_GIT_ACTION = "plugins/git-action:1"
31
31
PLUGINS_S3 = "plugins/s3"
@@ -188,7 +188,7 @@ def gui_test_pipeline(ctx):
188
188
squish_parameters += " --tags %s" % params ["tags" ]
189
189
190
190
steps = skipIfUnchanged (ctx , "gui-tests" ) + \
191
- build_client (OC_CI_CLIENT_FEDORA , False )
191
+ build_client (OC_CI_SQUISH , False )
192
192
193
193
services = testMiddlewareService (server )
194
194
@@ -232,8 +232,10 @@ def gui_test_pipeline(ctx):
232
232
return pipelines
233
233
234
234
def build_client (image = OC_CI_CLIENT , ctest = True ):
235
- cmake_options = '-G"%s" -DCMAKE_C_COMPILER="%s" -DCMAKE_CXX_COMPILER="%s" -DCMAKE_BUILD_TYPE="%s"'
236
- cmake_options = cmake_options % (build_config ["generator" ], build_config ["c_compiler" ], build_config ["cxx_compiler" ], build_config ["build_type" ])
235
+ cmake_options = '-G"%s" -DCMAKE_BUILD_TYPE="%s"' % (build_config ["generator" ], build_config ["build_type" ])
236
+
237
+ if image != OC_CI_SQUISH :
238
+ cmake_options += ' -DCMAKE_C_COMPILER="%s" -DCMAKE_CXX_COMPILER="%s"' % (build_config ["c_compiler" ], build_config ["cxx_compiler" ])
237
239
238
240
if ctest :
239
241
cmake_options += " -DBUILD_TESTING=ON"
@@ -247,8 +249,8 @@ def build_client(image = OC_CI_CLIENT, ctest = True):
247
249
"environment" : {
248
250
"LC_ALL" : "C.UTF-8" ,
249
251
},
252
+ "user" : "0:0" ,
250
253
"commands" : [
251
- "git submodule update --init --recursive" ,
252
254
"mkdir -p %s" % dir ["build" ],
253
255
"cd %s" % dir ["build" ],
254
256
# generate build files
0 commit comments