From 22a72ce1cd151d1897896ef341e0b78bd115648f Mon Sep 17 00:00:00 2001
From: Shylock Hg <33566796+Shylock-Hg@users.noreply.github.com>
Date: Thu, 23 Dec 2021 15:25:11 +0800
Subject: [PATCH 1/2] Hotfix vesoft/nebula-dev:centos7 lose environment
 variable TOOLSET_CLANG_DIR

---
 .github/workflows/pull_request.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index e45b63fc..5cc53e4a 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -59,6 +59,8 @@ jobs:
           gcc-*)
             case ${{ matrix.os }} in
             centos7)
+              # Hotfix vesoft/nebula-dev:centos7 lose environment variable TOOLSET_CLANG_DIR
+              export TOOLSET_CLANG_DIR=/opt/vesoft/toolset/clang/10.0.0
               # build with Release type
               cmake \
                   -DCMAKE_CXX_COMPILER=$TOOLSET_CLANG_DIR/bin/g++ \

From b3d175fae8ec3d692008b8320632e52fefceefcf Mon Sep 17 00:00:00 2001
From: Shylock Hg <33566796+Shylock-Hg@users.noreply.github.com>
Date: Thu, 23 Dec 2021 19:14:42 +0800
Subject: [PATCH 2/2] Fix compiler path.

---
 .github/workflows/pull_request.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 5cc53e4a..a3aecd33 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -59,12 +59,10 @@ jobs:
           gcc-*)
             case ${{ matrix.os }} in
             centos7)
-              # Hotfix vesoft/nebula-dev:centos7 lose environment variable TOOLSET_CLANG_DIR
-              export TOOLSET_CLANG_DIR=/opt/vesoft/toolset/clang/10.0.0
               # build with Release type
               cmake \
-                  -DCMAKE_CXX_COMPILER=$TOOLSET_CLANG_DIR/bin/g++ \
-                  -DCMAKE_C_COMPILER=$TOOLSET_CLANG_DIR/bin/gcc \
+                  -DCMAKE_CXX_COMPILER=$TOOLSET_GCC_DIR/bin/g++ \
+                  -DCMAKE_C_COMPILER=$TOOLSET_GCC_DIR/bin/gcc \
                   -DCMAKE_BUILD_TYPE=Release \
                   -DENABLE_TESTING=on \
                   -DCMAKE_INSTALL_PREFIX=/usr/local/nebula \
@@ -74,8 +72,8 @@ jobs:
             ubuntu1804)
               # build with Debug type
               cmake \
-                  -DCMAKE_CXX_COMPILER=$TOOLSET_CLANG_DIR/bin/g++ \
-                  -DCMAKE_C_COMPILER=$TOOLSET_CLANG_DIR/bin/gcc \
+                  -DCMAKE_CXX_COMPILER=$TOOLSET_GCC_DIR/bin/g++ \
+                  -DCMAKE_C_COMPILER=$TOOLSET_GCC_DIR/bin/gcc \
                   -DCMAKE_BUILD_TYPE=Debug \
                   -DENABLE_TESTING=on \
                   -DCMAKE_INSTALL_PREFIX=/usr/local/nebula \