ENT-12140: deps upgrades (3.21) #1491
Conversation
|
asked for a "big build" aka all platforms and run all tests: github generated hub package for ubu20 looked fine in testing. |
|
@cf-bottom jenkins please, with fixes for centos-7 and ubuntu-20 |
|
Alright, I triggered a build: Jenkins: https://ci.cfengine.com/job/pr-pipeline/11138/ Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-11138/ |
|
Try just centos-7 with fixes: |
|
|
|
|
|
|
|
|
|
|
|
|
craigcomstock
force-pushed
the
3.21.x-deps-2024-08-23_09_24_48_174551
branch
from
76fb2be
to
773bb4d
Compare
|
|
|
|
|
just centos-7 client this time, faster, |
|
|
|
added more things to package in the test-only package: |
craigcomstock
force-pushed
the
3.21.x-deps-2024-08-23_09_24_48_174551
branch
2 times, most recently
from
ab298cf
to
b0b9acd
Compare
|
maybe done? with lcov at least? |
|
retry, remove more things: |
(cherry picked from commit 0f76eb9)
craigcomstock
force-pushed
the
3.21.x-deps-2024-08-23_09_24_48_174551
branch
from
b0c376d
to
aa0f58a
Compare
|
retry with lcov removal |
|
rebuilding for rhel8hub: |
|
Trying a full build as maybe things are good now? |
|
rhel8hub only: |
|
retry ubu16hub: |
|
oops, forgot the mission-portal PR in the rhel8hub rebuild, should be fine, but will re-check now: |
|
try ubu16hub if that is green I will do a full run and make sure commits look good. |
craigcomstock
force-pushed
the
3.21.x-deps-2024-08-23_09_24_48_174551
branch
from
9fc707b
to
add425e
Compare
|
yeah, looooooooks good. @cf-bottom jenkins please, throw everything at this PR. Thanks. |
|
Alright, I triggered a build: Jenkins: https://ci.cfengine.com/job/pr-pipeline/11177/ Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-11177/ |
deps-packaging/php/cfbuild-php.spec
Outdated
| @@ -34,7 +34,7 @@ fi | |||
| --with-iconv \ | |||
| --with-zlib=%{prefix} \ | |||
| --with-libmbfl=%{prefix} \ | |||
| --enable-mbstring \ | |||
| --enable-mbstring=shared \ | |||
There was a problem hiding this comment.
Are we also doing:
you also need to add extension=mbstring.so to your php.ini
?
There was a problem hiding this comment.
no. curious about where/how it is used! 👍 I will check. I didn't see any issues/errors...
There was a problem hiding this comment.
we have three shared extensions:
cfbuild-php.spec: --with-openssl=shared,%{prefix} \
cfbuild-php.spec: --with-curl=shared,%{prefix} \
cfbuild-php.spec: --enable-mbstring=shared \
Interesting that the others had a trailing ,%{prefix} and neither curl nor openssl .so files are explicitly added to php.ini.
I will check that the mb_* functions operate properly on an instance and see if we need to fix things. 👍 The mb_* functions are only used in a handful of places but a few may be used by many other places.
application/libraries/Cfe_table.php: $data = urlencode((mb_convert_encoding($data, 'UTF-8')));
application/controllers/Hubstatus.php: $arrayData = json_decode(mb_convert_encoding($statusData, 'UTF-8'), true);
tests/mocks/ci_basetestcase.php: $array = json_decode(mb_convert_encoding($data, 'UTF-8'), true);
tests/mocks/core/utf8.php: mb_internal_encoding('UTF-8');
tests/phpunit/models/VitalsModelTest.php: $array = json_decode(mb_convert_encoding($json, 'UTF-8'), true);
There was a problem hiding this comment.
yeah, good catch, this sample doesn't work unless I add extension=mbstring.so to a local php.ini file.
I wonder about the other two: curl and openssl, will check!
Ah, we handle this in a different way: individual files:
root@localhost:~# php --ini
Configuration File (php.ini) Path: /var/cfengine/httpd/php/lib
Loaded Configuration File: /var/cfengine/httpd/php/lib/php.ini
Scan for additional .ini files in: /var/cfengine/httpd/php/lib
Additional .ini files parsed: /var/cfengine/httpd/php/lib/cfengine-enterprise-api.ini,
/var/cfengine/httpd/php/lib/cfmod.ini,
/var/cfengine/httpd/php/lib/curl.ini,
/var/cfengine/httpd/php/lib/openssl.ini,
/var/cfengine/httpd/php/lib/php.ini
Will fix.
There was a problem hiding this comment.
https://www.phpinternalsbook.com/php7/build_system/building_extensions.html#building-php-extensions
not sure what the ,%{prefix} is all about yet, looking...
There was a problem hiding this comment.
from configure script output
Extensions:
--with-EXTENSION=shared[,PATH]
NOTE: Not all extensions can be built as 'shared'.
Example: --with-foobar=shared,/usr/local/foobar/
o Builds the foobar extension as shared extension.
o foobar package install prefix is /usr/local/foobar/
So given the result of the latest build the PREFIX added on doesn't do much as all three shared extensions are in the same place. I'll add it as I fix the inclusion now and see how it goes.
deps-packaging/php/cfbuild-php.spec
Outdated
| @@ -34,7 +34,7 @@ fi | |||
| --with-iconv \ | |||
| --with-zlib=%{prefix} \ | |||
| --with-libmbfl=%{prefix} \ | |||
| --enable-mbstring \ | |||
| --enable-mbstring=shared \ | |||
There was a problem hiding this comment.
we have three shared extensions:
cfbuild-php.spec: --with-openssl=shared,%{prefix} \
cfbuild-php.spec: --with-curl=shared,%{prefix} \
cfbuild-php.spec: --enable-mbstring=shared \
Interesting that the others had a trailing ,%{prefix} and neither curl nor openssl .so files are explicitly added to php.ini.
I will check that the mb_* functions operate properly on an instance and see if we need to fix things. 👍 The mb_* functions are only used in a handful of places but a few may be used by many other places.
application/libraries/Cfe_table.php: $data = urlencode((mb_convert_encoding($data, 'UTF-8')));
application/controllers/Hubstatus.php: $arrayData = json_decode(mb_convert_encoding($statusData, 'UTF-8'), true);
tests/mocks/ci_basetestcase.php: $array = json_decode(mb_convert_encoding($data, 'UTF-8'), true);
tests/mocks/core/utf8.php: mb_internal_encoding('UTF-8');
tests/phpunit/models/VitalsModelTest.php: $array = json_decode(mb_convert_encoding($json, 'UTF-8'), true);
- Modified php building for buggy old toolchains php/php-src#12774 https://sourceware.org/bugzilla/show_bug.cgi?id=23169 - Patched php configure script for ubuntu-16 old gcc version 5 The check in php/build/php.m4 is not sufficient to guard for gcc 5 on ubuntu 16 Ticket: ENT-12140 Changelog: none.
craigcomstock
force-pushed
the
3.21.x-deps-2024-08-23_09_24_48_174551
branch
from
add425e
to
0205cc5
Compare
|
cancelled the big CI run and retrying ubu16hub only: |
|
@cf-bottom jenkins again please, full deal, I think we are good. 🤞 |
|
Alright, I triggered a build: Jenkins: https://ci.cfengine.com/job/pr-pipeline/11179/ Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-11179/ |
|
retry build tests, seem flaky: |
|
We didn't run on exotics explicitly before merging. The weekly CI was aborted, https://ci.cfengine.com/view/weekly/job/3.21.x-weekly-pipeline/126/, so didn't check things for us. Here is a retry just to check again: |
|
check aix71 since it was offline nevermind, it did succeed eventually. cancelled that build ^^^ |
Ticket: ENT-12140
together
cfengine/core#5603
#1491