Fix github CI (#470)

Summary: Pull Request resolved: #470 Reviewed By: malanka Differential Revision: D62227838 fbshipit-source-id: 01802dd992322466e433a05cbb63c3169a22e014
facebookincubator · Sep 5, 2024 · c0f64b6 · c0f64b6
1 parent 9d55822
commit c0f64b6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -133,6 +133,7 @@ jobs:
           update-alternatives --install /usr/bin/gcc gcc /usr/bin/clang-$VER 10
           # needed for `hsc2hs`, `g++` is hardcoded into `hsc2hs-options`.
           update-alternatives --install /usr/bin/g++ g++ /usr/bin/clang++-$VER 10
+          echo CABAL_CONFIG_FLAGS="$CABAL_CONFIG_FLAGS -fclang" >>"$GITHUB_ENV"
 
       - name: Install folly and rocksdb dependencies
         run: |
@@ -156,7 +157,7 @@ jobs:
         run: cabal update
 
       - name: Disable some tests
-        run: echo CABAL_CONFIG_FLAGS="-f-hack-tests -f-rust-tests -f-python-tests" >> "$GITHUB_ENV"
+        run: echo CABAL_CONFIG_FLAGS="$CABAL_CONFIG_FLAGS -f-hack-tests -f-rust-tests -f-python-tests" >> "$GITHUB_ENV"
 
       - name: Install hsthrift and Glean dependencies
         run: apt-get install -y pkg-config rsync libgmock-dev libpcre3-dev libtinfo-dev libxxhash-dev

diff --git a/glean.cabal.in b/glean.cabal.in
@@ -52,7 +52,9 @@ common fb-haskell
      ghc-options: -O2
 
 common fb-cpp
-  cxx-options: -std=c++17 -fcoroutines
+  cxx-options: -std=c++17
+  if !flag(clang)
+     cxx-options: -fcoroutines
   if arch(x86_64)
      cxx-options: -march=haswell
   if flag(opt)
@@ -63,6 +65,9 @@ common fb-cpp
 common exe
   ghc-options: -threaded
 
+flag clang
+     default: False
+
 flag opt
      default: False
 

diff --git a/glean/lang/go/tests/cases/xrefs/metadata.out b/glean/lang/go/tests/cases/xrefs/metadata.out
@@ -12,4 +12,4 @@
       "textEncoding": 1
     }
   }
-]
+]