Skip to content

Commit bc90f15

Browse files
authored
AIX and RHEL 9 fixes. (#170)
* Updated brink stuff from server repo. * Require AIX 7.2. * Updated deps docs. * Back to supporting AIX 7.1
1 parent 90dc4a6 commit bc90f15

3 files changed

Lines changed: 13 additions & 3 deletions

File tree

brink.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
BASE_REQUIREMENTS='pip==20.3.4chevah chevah-brink==0.79.0 paver==1.2.4'
2-
PYTHON_CONFIGURATION='default@2.7.18.241e9fe'
2+
PYTHON_CONFIGURATION='default@2.7.18.90dc4a6'
33
# For production packages there are 2 options:
44
BINARY_DIST_URI='https://github.com/chevah/python-package/releases/download'
55
#BINARY_DIST_URI='https://bin.chevah.com:20443/production'

brink.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,10 @@ clean_build() {
139139
delete_folder ${DIST_FOLDER}
140140
echo "Removing publish..."
141141
delete_folder 'publish'
142+
echo "Removing node_modules..."
143+
delete_folder node_modules
144+
echo "Removing web build"
145+
delete_folder chevah/server/static/build/
142146

143147
# In some case pip hangs with a build folder in temp and
144148
# will not continue until it is manually removed.
@@ -766,7 +770,12 @@ detect_os() {
766770
os_version_raw="$VERSION_ID"
767771
check_os_version "Red Hat Enterprise Linux" 8 \
768772
"$os_version_raw" os_version_chevah
769-
set_os_if_not_generic "rhel" $os_version_chevah
773+
if [ ${os_version_chevah} == "8" ]; then
774+
set_os_if_not_generic "rhel" $os_version_chevah
775+
else
776+
# OpenSSL 3.0.x not supported by cryptography 3.3.x.
777+
check_linux_libc
778+
fi
770779
;;
771780
ubuntu|ubuntu-core)
772781
os_version_raw="$VERSION_ID"

chevah_build

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,8 @@ case "$ARCH" in
345345
;;
346346
esac
347347
# Only add to $MAKE if there is one, so that NMAKE on Windows is not confused.
348-
if [ -n "${MAKE-}" ]; then
348+
# But not on AIX, where there are random errors w/ parallel builds on IBM Cloud.
349+
if [ -n "${MAKE-}" -a "${OS%aix*}" != "" ]; then
349350
export MAKE="$MAKE -j${JOBS}"
350351
fi
351352

0 commit comments

Comments
 (0)