Skip to content

Commit b068051

Browse files
committed
fix ci issues. set fPIC on opentracing builds. revert changes to the cmake_install.yml so googletest and benchmark are installed. add missing curl packages to ci.yml tests
1 parent 6442655 commit b068051

File tree

3 files changed

+21
-12
lines changed

3 files changed

+21
-12
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,7 @@ jobs:
361361
CXX: /usr/bin/g++-12
362362
run: |
363363
sudo -E ./ci/setup_ci_environment.sh
364+
sudo -E apt-get install -y zlib1g-dev libcurl4-openssl-dev
364365
- name: run cmake tests (without otlp-exporter)
365366
env:
366367
CC: /usr/bin/gcc-12
@@ -1172,6 +1173,7 @@ jobs:
11721173
CXX: /usr/bin/g++-12
11731174
run: |
11741175
sudo -E ./ci/setup_ci_environment.sh
1176+
sudo -E apt-get install -y zlib1g-dev libcurl4-openssl-dev
11751177
- name: run w3c trace-context test server (background)
11761178
env:
11771179
CXX_STANDARD: '14'

.github/workflows/cmake_install.yml

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,14 @@ jobs:
7171
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7272
with:
7373
submodules: 'recursive'
74-
- name: Setup Environment
74+
- name: Install libcurl, zlib, nlohmann-json with apt
7575
run: |
7676
sudo -E ./ci/setup_ci_environment.sh
77-
- name: Install Dependencies
77+
sudo -E ./ci/setup_googletest.sh
78+
- name: Install abseil, protobuf, and grpc with apt
7879
run: |
7980
sudo -E apt-get update
80-
sudo -E apt-get install -y zlib1g-dev libcurl4-openssl-dev nlohmann-json3-dev libabsl-dev libprotobuf-dev libgrpc++-dev protobuf-compiler protobuf-compiler-grpc
81+
sudo -E apt-get install -y libabsl-dev libprotobuf-dev libgrpc++-dev protobuf-compiler protobuf-compiler-grpc
8182
- name: Run Tests (static libs)
8283
env:
8384
BUILD_SHARED_LIBS: 'OFF'
@@ -97,6 +98,7 @@ jobs:
9798
# Versions below set to the latest version available
9899
# The abseil and protobuf versions are taken from
99100
# the grpc submodules at the GRPC_VERSION tag
101+
GOOGLETEST_VERSION: '1.16.0'
100102
ABSEIL_CPP_VERSION: '20240722.1'
101103
PROTOBUF_VERSION: '29.0'
102104
GRPC_VERSION: 'v1.71.0'
@@ -110,12 +112,12 @@ jobs:
110112
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
111113
with:
112114
submodules: 'recursive'
113-
- name: Setup Environment
115+
- name: Install gtest, libcurl, zlib, nlohmann-json with apt
114116
run: |
115117
sudo -E ./ci/setup_ci_environment.sh
116-
- name: Install Dependencies
118+
sudo -E ./ci/setup_googletest.sh
119+
- name: Build abseil, protobuf, and grpc with ci scripts
117120
run: |
118-
sudo -E apt-get install -y zlib1g-dev libcurl4-openssl-dev
119121
sudo -E ./ci/install_abseil.sh
120122
sudo -E ./ci/install_protobuf.sh
121123
sudo -E ./ci/setup_grpc.sh -r $GRPC_VERSION -s $CXX_STANDARD -p protobuf -p abseil-cpp
@@ -132,6 +134,7 @@ jobs:
132134
CXX_STANDARD: '17'
133135
# These are stable versions tested in the main ci workflow
134136
# and defaults in the devcontainer
137+
GOOGLETEST_VERSION: '1.14.0'
135138
ABSEIL_CPP_VERSION: '20230125.3'
136139
PROTOBUF_VERSION: '23.3'
137140
GRPC_VERSION: 'v1.55.0'
@@ -145,12 +148,12 @@ jobs:
145148
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
146149
with:
147150
submodules: 'recursive'
148-
- name: Setup Environment
151+
- name: Install gtest, libcurl, zlib, nlohmann-json with apt
149152
run: |
150153
sudo -E ./ci/setup_ci_environment.sh
151-
- name: Install Dependencies
154+
sudo -E ./ci/setup_googletest.sh
155+
- name: Build abseil, protobuf, and grpc with ci scripts
152156
run: |
153-
sudo -E apt-get install -y zlib1g-dev libcurl4-openssl-dev
154157
sudo -E ./ci/install_abseil.sh
155158
sudo -E ./ci/install_protobuf.sh
156159
sudo -E ./ci/setup_grpc.sh -r $GRPC_VERSION -s $CXX_STANDARD -p protobuf -p abseil-cpp
@@ -172,6 +175,8 @@ jobs:
172175
CMAKE_VERSION: '3.14.0'
173176
# cxx14 is the default for Ubuntu 22.04
174177
CXX_STANDARD: '14'
178+
# This is the apt package version of googletest for Ubuntu 22.04
179+
GOOGLETEST_VERSION: '1.11.0'
175180
# These are minimum versions tested in the main ci workflow
176181
ABSEIL_CPP_VERSION: '20220623.2'
177182
PROTOBUF_VERSION: '21.12'
@@ -186,13 +191,13 @@ jobs:
186191
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
187192
with:
188193
submodules: 'recursive'
189-
- name: Setup Environment
194+
- name: Install gtest, libcurl, zlib, nlohmann-json with apt
190195
run: |
191196
sudo -E ./ci/setup_ci_environment.sh
192197
sudo -E ./ci/setup_cmake.sh
193-
- name: Install Dependencies
198+
sudo -E ./ci/setup_googletest.sh
199+
- name: Build abseil, protobuf, and grpc with ci scripts
194200
run: |
195-
sudo -E apt-get install -y zlib1g-dev libcurl4-openssl-dev
196201
sudo -E ./ci/install_abseil.sh
197202
sudo -E ./ci/install_protobuf.sh
198203
sudo -E ./ci/setup_grpc.sh -r $GRPC_VERSION -s $CXX_STANDARD -p protobuf -p abseil-cpp

ci/do_ci.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ elif [[ "$1" == "cmake.opentracing_shim.test" ]]; then
238238
cmake "${CMAKE_OPTIONS[@]}" \
239239
-DCMAKE_CXX_FLAGS="-Werror -Wno-error=redundant-move $CXXFLAGS" \
240240
-DWITH_OPENTRACING=ON \
241+
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
241242
"${SRC_DIR}"
242243
make -j $(nproc)
243244
make test
@@ -249,6 +250,7 @@ elif [[ "$1" == "cmake.opentracing_shim.install.test" ]]; then
249250
cmake "${CMAKE_OPTIONS[@]}" \
250251
-DCMAKE_CXX_FLAGS="-Werror -Wno-error=redundant-move $CXXFLAGS" \
251252
-DWITH_OPENTRACING=ON \
253+
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
252254
-DCMAKE_INSTALL_PREFIX=${INSTALL_TEST_DIR} \
253255
"${SRC_DIR}"
254256
make -j $(nproc)

0 commit comments

Comments
 (0)