Add RHEL9 builds to CI/CD

neilstephens · Nov 23, 2024 · 3ed5a8c · 3ed5a8c
1 parent 5f43c45
commit 3ed5a8c
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 335 deletions.
diff --git a/.github/workflows/opendatacon.yml b/.github/workflows/opendatacon.yml
@@ -55,6 +55,18 @@ jobs:
             build-type: Debug
             docker-args:
 
+          - name: Redhat Enterprise Linux 9 Release
+            run-os: ubuntu-latest
+            docker-file: RHEL9
+            build-type: Release
+            docker-args:
+
+          - name: Redhat Enterprise Linux 9 Debug
+            run-os: ubuntu-latest
+            docker-file: RHEL9
+            build-type: Debug
+            docker-args:
+
     runs-on: ${{ matrix.run-os }}
 
     steps:

diff --git a/.travis.yml b/.travis.yml
diff --git a/Code/Libs/ODC/CMakeLists.txt b/Code/Libs/ODC/CMakeLists.txt
@@ -35,9 +35,19 @@ endif()
 
 if(ODC_ASIO_SSL)
 	message("OpenSSL root dir: ${OPENSSL_ROOT_DIR}")
+
+	# First try with static libs
 	set(OPENSSL_USE_STATIC_LIBS TRUE)
 	set(OPENSSL_MSVC_STATIC_RT TRUE)
-	find_package(OpenSSL 1.1.1 REQUIRED)
+	find_package(OpenSSL 1.1.1 QUIET)
+
+	if(NOT OpenSSL_FOUND)
+	    message(STATUS "Static OpenSSL libraries not found, falling back to dynamic...")
+	    set(OPENSSL_USE_STATIC_LIBS FALSE)
+	    set(OPENSSL_MSVC_STATIC_RT FALSE)
+	    find_package(OpenSSL 1.1.1 REQUIRED)
+	endif()
+
 	add_definitions(-DODC_ASIO_SSL)
 	message("OpenSSL include dir: ${OPENSSL_INCLUDE_DIR}")
 	message("OpenSSL libraries: ${OPENSSL_LIBRARIES}")

diff --git a/Code/Ports/DNP3Port/CMakeLists.txt b/Code/Ports/DNP3Port/CMakeLists.txt
@@ -45,7 +45,7 @@ if(USE_DNP3_SUBMODULE)
 		DNP3_CMAKE_OPTS
 			-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
 			-DDNP3_STATIC_LIBS=ON
-			-DOPENSSL_USE_STATIC_LIBS=TRUE
+			-DOPENSSL_USE_STATIC_LIBS=${OPENSSL_USE_STATIC_LIBS}
 			"-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -fPIC"
 			-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
 			-DCMAKE_INSTALL_PREFIX=${DNP3_HOME}/

diff --git a/DockerFiles/RHEL9 b/DockerFiles/RHEL9
@@ -0,0 +1,23 @@
+# syntax=docker/dockerfile:1.2
+
+FROM redhat/ubi9 as builder
+
+RUN dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
+RUN yum install -y socat g++ libstdc++-static cmake git openssl-devel python3-devel file libmodbus libmodbus-devel
+
+RUN git clone --recurse-submodules https://github.com/neilstephens/opendatacon.git
+ARG BUILD_COMMIT=develop
+RUN git -C opendatacon checkout $BUILD_COMMIT
+
+ARG BUILD_TYPE=Release
+RUN mkdir opendatacon-build
+
+RUN cmake -DFULL=ON -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_SYSTEM_VERSION=rhel9 \
+-DOPENSSL_ROOT_DIR=/usr/ -S opendatacon -B opendatacon-build
+
+RUN cmake --build opendatacon-build --parallel 8
+RUN cmake --build opendatacon-build --target install
+RUN cmake --build opendatacon-build --target package
+
+FROM scratch AS export-stage
+COPY --from=builder opendatacon-build/opendatacon*.sh /