From e47c8fc9f99c0ba00d4b520e294999b8fe45cf3b Mon Sep 17 00:00:00 2001 From: Ehsan Saei <71217171+esigo@users.noreply.github.com> Date: Wed, 12 Jun 2024 19:32:18 +0200 Subject: [PATCH 1/7] Enable ARM64 build in CI --- .github/workflows/ci.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5834ca2fd4..7b365ef60f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,6 +7,26 @@ on: branches: [ main ] jobs: + arm_test: + name: CMake test on ARM (without otlp-exporter) + runs-on: actuated-arm64-4cpu-16gb + steps: + - uses: actions/checkout@v4 + with: + submodules: 'recursive' + - name: setup + env: + CC: /usr/bin/gcc-10 + CXX: /usr/bin/g++-10 + run: | + sudo -E ./ci/setup_googletest.sh + sudo -E ./ci/setup_ci_environment.sh + - name: run cmake tests (without otlp-exporter) + env: + CC: /usr/bin/gcc-10 + CXX: /usr/bin/g++-10 + run: | + ./ci/do_ci.sh cmake.test cmake_test: name: CMake test (without otlp-exporter) runs-on: ubuntu-latest From 694f44107581081709082c3a4c1a9374157b2801 Mon Sep 17 00:00:00 2001 From: Ehsan Saei <71217171+esigo@users.noreply.github.com> Date: Fri, 14 Jun 2024 21:17:03 +0200 Subject: [PATCH 2/7] install cmake --- .github/workflows/ci.yml | 2 +- ci/setup_ci_environment.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b365ef60f..4d49f27e69 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,8 +19,8 @@ jobs: CC: /usr/bin/gcc-10 CXX: /usr/bin/g++-10 run: | - sudo -E ./ci/setup_googletest.sh sudo -E ./ci/setup_ci_environment.sh + sudo -E ./ci/setup_googletest.sh - name: run cmake tests (without otlp-exporter) env: CC: /usr/bin/gcc-10 diff --git a/ci/setup_ci_environment.sh b/ci/setup_ci_environment.sh index ed4378e2d6..11962620e9 100755 --- a/ci/setup_ci_environment.sh +++ b/ci/setup_ci_environment.sh @@ -7,6 +7,7 @@ set -e apt-get update apt-get install --no-install-recommends --no-install-suggests -y \ build-essential \ + cmake \ ca-certificates \ wget \ git \ From 95d37b629349704f504528dca19edac333f7b84a Mon Sep 17 00:00:00 2001 From: Ehsan Saei <71217171+esigo@users.noreply.github.com> Date: Fri, 14 Jun 2024 21:20:11 +0200 Subject: [PATCH 3/7] install gcc --- ci/setup_ci_environment.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/setup_ci_environment.sh b/ci/setup_ci_environment.sh index 11962620e9..0e0a04e145 100755 --- a/ci/setup_ci_environment.sh +++ b/ci/setup_ci_environment.sh @@ -8,6 +8,8 @@ apt-get update apt-get install --no-install-recommends --no-install-suggests -y \ build-essential \ cmake \ + g++-10 \ + gcc-10 \ ca-certificates \ wget \ git \ From f28aa9dfc40d26459457e006070a3e9776a789bf Mon Sep 17 00:00:00 2001 From: Ehsan Saei <71217171+esigo@users.noreply.github.com> Date: Mon, 17 Jun 2024 10:36:01 +0200 Subject: [PATCH 4/7] otlp test --- .github/workflows/ci.yml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4d49f27e69..d178024fa6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,8 +7,8 @@ on: branches: [ main ] jobs: - arm_test: - name: CMake test on ARM (without otlp-exporter) + arm64_test: + name: CMake test arm64 (with modern protobuf,grpc and abseil) runs-on: actuated-arm64-4cpu-16gb steps: - uses: actions/checkout@v4 @@ -16,17 +16,26 @@ jobs: submodules: 'recursive' - name: setup env: + PROTOBUF_VERSION: '23.3' + ABSEIL_CPP_VERSION: '20230125.3' + CXX_STANDARD: '14' CC: /usr/bin/gcc-10 CXX: /usr/bin/g++-10 run: | sudo -E ./ci/setup_ci_environment.sh sudo -E ./ci/setup_googletest.sh - - name: run cmake tests (without otlp-exporter) + sudo -E ./ci/install_abseil.sh + sudo -E ./ci/install_protobuf.sh + - name: run otlp exporter tests env: CC: /usr/bin/gcc-10 CXX: /usr/bin/g++-10 + WITH_ABSEIL: 'ON' + CXX_STANDARD: '14' run: | - ./ci/do_ci.sh cmake.test + sudo -E ./ci/setup_grpc.sh -m -p protobuf -p abseil-cpp + ./ci/do_ci.sh cmake.exporter.otprotocol.test + cmake_test: name: CMake test (without otlp-exporter) runs-on: ubuntu-latest From 35dda0cc5f2af6caddf5eba07862657d37cfb788 Mon Sep 17 00:00:00 2001 From: Ehsan Saei <71217171+esigo@users.noreply.github.com> Date: Tue, 18 Jun 2024 19:49:47 +0200 Subject: [PATCH 5/7] review --- .github/workflows/ci.yml | 2 ++ ci/setup_cmake.sh | 9 +++++++++ ci/setup_gcc10.sh | 10 ++++++++++ 3 files changed, 21 insertions(+) create mode 100644 ci/setup_cmake.sh create mode 100644 ci/setup_gcc10.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d30369cca7..8c17bbece0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,6 +22,8 @@ jobs: CC: /usr/bin/gcc-10 CXX: /usr/bin/g++-10 run: | + sudo -E ./ci/setup_gcc10.sh + sudo -E ./ci/setup_cmake.sh sudo -E ./ci/setup_ci_environment.sh sudo -E ./ci/setup_googletest.sh sudo -E ./ci/install_abseil.sh diff --git a/ci/setup_cmake.sh b/ci/setup_cmake.sh new file mode 100644 index 0000000000..0cb5d7eb79 --- /dev/null +++ b/ci/setup_cmake.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +# Copyright The OpenTelemetry Authors +# SPDX-License-Identifier: Apache-2.0 + +set -e +apt-get update +apt-get install --no-install-recommends --no-install-suggests -y \ + cmake diff --git a/ci/setup_gcc10.sh b/ci/setup_gcc10.sh new file mode 100644 index 0000000000..119d361cbf --- /dev/null +++ b/ci/setup_gcc10.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +# Copyright The OpenTelemetry Authors +# SPDX-License-Identifier: Apache-2.0 + +set -e +apt-get update +apt-get install --no-install-recommends --no-install-suggests -y \ + g++-10 \ + gcc-10 From cc8f45870ae2d55e452bfc670620ce2da794d2ce Mon Sep 17 00:00:00 2001 From: Ehsan Saei <71217171+esigo@users.noreply.github.com> Date: Tue, 18 Jun 2024 19:51:31 +0200 Subject: [PATCH 6/7] clean --- ci/setup_ci_environment.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/ci/setup_ci_environment.sh b/ci/setup_ci_environment.sh index 0e0a04e145..ed4378e2d6 100755 --- a/ci/setup_ci_environment.sh +++ b/ci/setup_ci_environment.sh @@ -7,9 +7,6 @@ set -e apt-get update apt-get install --no-install-recommends --no-install-suggests -y \ build-essential \ - cmake \ - g++-10 \ - gcc-10 \ ca-certificates \ wget \ git \ From fa1e9b0b1d3f8442c0dc594343d30632f7e6d510 Mon Sep 17 00:00:00 2001 From: Oblivion Date: Tue, 18 Jun 2024 18:16:42 +0000 Subject: [PATCH 7/7] 755 permission --- ci/setup_cmake.sh | 0 ci/setup_gcc10.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 ci/setup_cmake.sh mode change 100644 => 100755 ci/setup_gcc10.sh diff --git a/ci/setup_cmake.sh b/ci/setup_cmake.sh old mode 100644 new mode 100755 diff --git a/ci/setup_gcc10.sh b/ci/setup_gcc10.sh old mode 100644 new mode 100755