Skip to content

Commit 0dc2268

Browse files
authored
Fix CI build (#1798)
1 parent a0e98fb commit 0dc2268

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

.github/workflows/ci.yml

+17-17
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616
submodules: 'recursive'
1717
- name: setup
1818
run: |
19-
sudo ./ci/setup_cmake.sh
20-
sudo ./ci/setup_ci_environment.sh
19+
sudo CC=/usr/bin/gcc-10 CXX=/usr/bin/g++-10 ./ci/setup_cmake.sh
20+
sudo CC=/usr/bin/gcc-10 CXX=/usr/bin/g++-10 ./ci/setup_ci_environment.sh
2121
- name: run cmake tests (without otlp-exporter)
2222
run: |
23-
sudo ./ci/setup_thrift.sh
24-
./ci/do_ci.sh cmake.test
23+
sudo CC=/usr/bin/gcc-10 CXX=/usr/bin/g++-10 ./ci/setup_thrift.sh
24+
CC=/usr/bin/gcc-10 CXX=/usr/bin/g++-10 ./ci/do_ci.sh cmake.test
2525
2626
cmake_gcc_maintainer_test:
2727
name: CMake gcc (maintainer mode)
@@ -78,16 +78,16 @@ jobs:
7878
submodules: 'recursive'
7979
- name: setup
8080
run: |
81-
sudo ./ci/setup_cmake.sh
82-
sudo ./ci/setup_ci_environment.sh
81+
sudo CC=/usr/bin/gcc-10 CXX=/usr/bin/g++-10 ./ci/setup_cmake.sh
82+
sudo CC=/usr/bin/gcc-10 CXX=/usr/bin/g++-10 ./ci/setup_ci_environment.sh
8383
- name: run cmake tests (without otlp-exporter)
8484
run: |
85-
sudo ./ci/setup_thrift.sh
86-
./ci/do_ci.sh cmake.with_async_export.test
85+
sudo CC=/usr/bin/gcc-10 CXX=/usr/bin/g++-10 ./ci/setup_thrift.sh
86+
CC=/usr/bin/gcc-10 CXX=/usr/bin/g++-10 ./ci/do_ci.sh cmake.with_async_export.test
8787
8888
cmake_absel_stl_test:
8989
name: CMake test (with abseil)
90-
runs-on: ubuntu-latest
90+
runs-on: ubuntu-20.04
9191
steps:
9292
- uses: actions/checkout@v3
9393
with:
@@ -162,7 +162,7 @@ jobs:
162162

163163
cmake_otprotocol_test:
164164
name: CMake test (with otlp-exporter)
165-
runs-on: ubuntu-latest
165+
runs-on: ubuntu-20.04
166166
steps:
167167
- uses: actions/checkout@v3
168168
with:
@@ -185,10 +185,10 @@ jobs:
185185
submodules: 'recursive'
186186
- name: setup
187187
run: |
188-
sudo ./ci/setup_cmake.sh
189-
sudo ./ci/setup_ci_environment.sh
188+
sudo CC=/usr/bin/gcc-10 CXX=/usr/bin/g++-10 ./ci/setup_cmake.sh
189+
sudo CC=/usr/bin/gcc-10 CXX=/usr/bin/g++-10 ./ci/setup_ci_environment.sh
190190
- name: run tests
191-
run: ./ci/do_ci.sh cmake.test_example_plugin
191+
run: CC=/usr/bin/gcc-10 CXX=/usr/bin/g++-10 ./ci/do_ci.sh cmake.test_example_plugin
192192

193193
bazel_test:
194194
name: Bazel
@@ -346,7 +346,7 @@ jobs:
346346

347347
bazel_tsan:
348348
name: Bazel tsan config
349-
runs-on: ubuntu-latest
349+
runs-on: ubuntu-20.04
350350
steps:
351351
- uses: actions/checkout@v3
352352
with:
@@ -493,10 +493,10 @@ jobs:
493493
submodules: 'recursive'
494494
- name: setup
495495
run: |
496-
sudo ./ci/setup_cmake.sh
497-
sudo ./ci/setup_ci_environment.sh
496+
sudo CC=/usr/bin/gcc-10 CXX=/usr/bin/g++-10 ./ci/setup_cmake.sh
497+
sudo CC=/usr/bin/gcc-10 CXX=/usr/bin/g++-10 ./ci/setup_ci_environment.sh
498498
- name: run tests and generate report
499-
run: ./ci/do_ci.sh code.coverage
499+
run: CC=/usr/bin/gcc-10 CXX=/usr/bin/g++-10 ./ci/do_ci.sh code.coverage
500500
- name: upload report
501501
uses: codecov/codecov-action@v3
502502
with:

.github/workflows/codeql-analysis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ jobs:
2020
rm -rf third_party
2121
- name: Setup
2222
run: |
23-
sudo ./ci/setup_cmake.sh
24-
sudo ./ci/setup_ci_environment.sh
23+
sudo CC=/usr/bin/gcc-10 CXX=/usr/bin/g++-10 ./ci/setup_cmake.sh
24+
sudo CC=/usr/bin/gcc-10 CXX=/usr/bin/g++-10 ./ci/setup_ci_environment.sh
2525
- name: Initialize CodeQL
2626
uses: github/codeql-action/init@v2
2727
with:

0 commit comments

Comments
 (0)