Skip to content

Commit 36bab73

Browse files
sedmichasedmicha
authored
Merge pull request #72 from CESNET/ci-add-oracle-linux-9
Add CI support for Oracle Linux 9
2 parents 384d264 + e4244e4 commit 36bab73

File tree

4 files changed

+42
-21
lines changed

4 files changed

+42
-21
lines changed

‎.github/workflows/main.yml‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
- 'centos:7'
2525
- 'quay.io/centos/centos:stream8'
2626
- 'oraclelinux:8'
27+
- 'oraclelinux:9'
2728

2829
name: Build on ${{ matrix.image }}
2930
container: ${{ matrix.image }}
@@ -44,19 +45,28 @@ jobs:
4445
run: |
4546
dnf -y install 'dnf-command(config-manager)'
4647
dnf config-manager --set-enabled appstream powertools
47-
- name: Enable additional repositories (Oracle Linux)
48-
if: contains(matrix.image, 'oraclelinux')
48+
- name: Enable additional repositories (Oracle Linux 8)
49+
if: contains(matrix.image, 'oraclelinux:8')
4950
run: |
5051
dnf -y install 'dnf-command(config-manager)'
5152
dnf config-manager --set-enabled ol8_appstream ol8_codeready_builder
53+
- name: Enable additional repositories (Oracle Linux 9)
54+
if: contains(matrix.image, 'oraclelinux:9')
55+
run: |
56+
dnf -y install 'dnf-command(config-manager)'
57+
dnf config-manager --set-enabled ol9_appstream ol9_codeready_builder
5258
- name: Enable EPEL (CentOS)
5359
if: contains(matrix.image, 'centos')
5460
run: |
5561
yum -y install epel-release
56-
- name: Enable EPEL (OracleLinux)
57-
if: contains(matrix.image, 'oraclelinux')
62+
- name: Enable EPEL (Oracle Linux 8)
63+
if: contains(matrix.image, 'oraclelinux:8')
5864
run: |
5965
dnf -y install oracle-epel-release-el8
66+
- name: Enable EPEL (Oracle Linux 9)
67+
if: contains(matrix.image, 'oraclelinux:9')
68+
run: |
69+
dnf -y install oracle-epel-release-el9
6070
- name: Install dependencies for libfds and IPFIXcol2 (CentOS, Oracle Linux)
6171
if: contains(matrix.image, 'centos') || contains(matrix.image, 'oraclelinux')
6272
run: |

‎.github/workflows/packages.yml‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ jobs:
9494
- 'centos:7'
9595
- 'quay.io/centos/centos:stream8'
9696
- 'oraclelinux:8'
97+
- 'oraclelinux:9'
9798

9899
name: Build RPMs on ${{ matrix.image }}
99100
container: ${{ matrix.image }}
@@ -118,19 +119,28 @@ jobs:
118119
run: |
119120
dnf -y install 'dnf-command(config-manager)'
120121
dnf config-manager --set-enabled appstream powertools
121-
- name: Enable additional repositories (Oracle Linux)
122-
if: contains(matrix.image, 'oraclelinux')
122+
- name: Enable additional repositories (Oracle Linux 8)
123+
if: contains(matrix.image, 'oraclelinux:8')
123124
run: |
124125
dnf -y install 'dnf-command(config-manager)'
125126
dnf config-manager --set-enabled ol8_appstream ol8_codeready_builder
127+
- name: Enable additional repositories (Oracle Linux 9)
128+
if: contains(matrix.image, 'oraclelinux:9')
129+
run: |
130+
dnf -y install 'dnf-command(config-manager)'
131+
dnf config-manager --set-enabled ol9_appstream ol9_codeready_builder
126132
- name: Enable EPEL (CentOS)
127133
if: contains(matrix.image, 'centos')
128134
run: |
129135
yum -y install epel-release
130-
- name: Enable EPEL (OracleLinux)
131-
if: contains(matrix.image, 'oraclelinux')
136+
- name: Enable EPEL (Oracle Linux 8)
137+
if: contains(matrix.image, 'oraclelinux:8')
132138
run: |
133139
dnf -y install oracle-epel-release-el8
140+
- name: Enable EPEL (Oracle Linux 9)
141+
if: contains(matrix.image, 'oraclelinux:9')
142+
run: |
143+
dnf -y install oracle-epel-release-el9
134144
- name: Install dependencies for libfds and IPFIXcol2 (CentOS, Oracle Linux)
135145
if: contains(matrix.image, 'centos') || contains(matrix.image, 'oraclelinux')
136146
run: |

‎CMakeModules/unit_tests.cmake‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ include(ExternalProject)
99
ExternalProject_Add(
1010
googletest
1111
GIT_REPOSITORY https://github.com/google/googletest.git
12-
GIT_TAG "release-1.8.1"
12+
GIT_TAG "release-1.12.1"
1313
UPDATE_COMMAND ""
1414
INSTALL_COMMAND ""
1515
LOG_DOWNLOAD ON
@@ -22,36 +22,36 @@ set(GTEST_INCLUDE_DIRS ${source_dir}/googletest/include)
2222
set(GMOCK_INCLUDE_DIRS ${source_dir}/googlemock/include)
2323

2424
ExternalProject_Get_Property(googletest binary_dir)
25-
set(GTEST_LIBRARY_PATH ${binary_dir}/googlemock/gtest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest.a)
25+
set(GTEST_LIBRARY_PATH ${binary_dir}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gtest.a)
2626
set(GTEST_LIBRARY gtest)
2727
add_library(${GTEST_LIBRARY} UNKNOWN IMPORTED)
2828
set_target_properties(${GTEST_LIBRARY} PROPERTIES
29-
IMPORTED_LOCATION ${GTEST_LIBRARY_PATH}
30-
IMPORTED_LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
29+
"IMPORTED_LOCATION" "${GTEST_LIBRARY_PATH}"
30+
"IMPORTED_LINK_INTERFACE_LIBRARIES" "${CMAKE_THREAD_LIBS_INIT}")
3131
add_dependencies(${GTEST_LIBRARY} googletest)
3232

33-
set(GTEST_MAIN_LIBRARY_PATH ${binary_dir}/googlemock/gtest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main.a)
33+
set(GTEST_MAIN_LIBRARY_PATH ${binary_dir}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main.a)
3434
set(GTEST_MAIN_LIBRARY gtest_main)
3535
add_library(${GTEST_MAIN_LIBRARY} UNKNOWN IMPORTED)
3636
set_target_properties(${GTEST_MAIN_LIBRARY} PROPERTIES
37-
IMPORTED_LOCATION ${GTEST_MAIN_LIBRARY_PATH}
38-
IMPORTED_LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
37+
"IMPORTED_LOCATION" "${GTEST_MAIN_LIBRARY_PATH}"
38+
"IMPORTED_LINK_INTERFACE_LIBRARIES" "${CMAKE_THREAD_LIBS_INIT}")
3939
add_dependencies(${GTEST_MAIN_LIBRARY} googletest)
4040

41-
set(GMOCK_LIBRARY_PATH ${binary_dir}/googlemock/${CMAKE_FIND_LIBRARY_PREFIXES}gmock.a)
41+
set(GMOCK_LIBRARY_PATH ${binary_dir}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gmock.a)
4242
set(GMOCK_LIBRARY gmock)
4343
add_library(${GMOCK_LIBRARY} UNKNOWN IMPORTED)
4444
set_target_properties(${GMOCK_LIBRARY} PROPERTIES
45-
IMPORTED_LOCATION ${GMOCK_LIBRARY_PATH}
46-
IMPORTED_LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
45+
"IMPORTED_LOCATION" "${GMOCK_LIBRARY_PATH}"
46+
"IMPORTED_LINK_INTERFACE_LIBRARIES" "${CMAKE_THREAD_LIBS_INIT}")
4747
add_dependencies(${GMOCK_LIBRARY} googletest)
4848

49-
set(GMOCK_MAIN_LIBRARY_PATH ${binary_dir}/googlemock/${CMAKE_FIND_LIBRARY_PREFIXES}gmock_main.a)
49+
set(GMOCK_MAIN_LIBRARY_PATH ${binary_dir}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gmock_main.a)
5050
set(GMOCK_MAIN_LIBRARY gmock_main)
5151
add_library(${GMOCK_MAIN_LIBRARY} UNKNOWN IMPORTED)
5252
set_target_properties(${GMOCK_MAIN_LIBRARY} PROPERTIES
53-
IMPORTED_LOCATION ${GMOCK_MAIN_LIBRARY_PATH}
54-
IMPORTED_LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
53+
"IMPORTED_LOCATION" "${GMOCK_MAIN_LIBRARY_PATH}"
54+
"IMPORTED_LINK_INTERFACE_LIBRARIES" "${CMAKE_THREAD_LIBS_INIT}")
5555
add_dependencies(${GMOCK_MAIN_LIBRARY} ${GTEST_LIBRARY})
5656

5757
include_directories(

‎pkg/rpm/ipfixcol2.spec.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ IPFIX Collector (ipfixcol).
4545

4646
# Build source code
4747
%build
48+
%global _vpath_builddir .
4849
%cmake .
4950
make %{?_smp_mflags}
5051

0 commit comments

Comments
 (0)