Fix CI (#564)

Summary:
NOTE: this includes #559, because some of the compile errors were in that code and it wasn't worth fixing them twice.

Pull Request resolved: #564

Test Plan:
Imported from GitHub, without a `Test Plan:` line.

Rollback Plan:

Reviewed By: rubmary

Differential Revision: D78016736

Pulled By: jjuliamolin

fbshipit-source-id: d5234476ba3ebfaa2dbd5399b7a685ef2893103a

Author: simonmar

.github/workflows/ci.yml

@@ -146,6 +146,19 @@ jobs:
       - name: Populate hackage index
         run: cabal update
 
+      # This tells the folly-clib package to look for folly using pkg-config
+      # instead of building its own copy of the sources. Later we can switch
+      # to using bundled-folly, or have CI test both variants.
+      - name: Disable bundled-folly
+        run: echo CABAL_CONFIG_FLAGS="$CABAL_CONFIG_FLAGS -f-bundled-folly" >> "$GITHUB_ENV"
+
+      - name: Grab folly sources
+        run: |
+          apt-get install -y wget
+          cd hsthrift
+          make setup-folly
+          make setup-folly-version
+
       - name: Disable some tests
         run: echo CABAL_CONFIG_FLAGS="$CABAL_CONFIG_FLAGS -f-hack-tests -f-rust-tests -f-python-tests" >> "$GITHUB_ENV"
 

glean.cabal.in

@@ -25,7 +25,6 @@ common fb-haskell
     default-extensions:
         BangPatterns
         BinaryLiterals
-        CPP
         DataKinds
         DeriveDataTypeable
         DeriveGeneric
@@ -134,10 +133,6 @@ common folly
         build-depends: fb-util < 0.2
         pkgconfig-depends: libfolly
 
--- Facebook-specific features
-flag facebook
-     default: False
-
 common deps
     build-depends:
         fb-util,
@@ -1129,10 +1124,7 @@ executable glean
         GleanCLI.Restore
         GleanCLI.Write
     ghc-options: -main-is GleanCLI -with-rtsopts=-I0
-    default-extensions: CPP
     extra-libraries: stdc++
-    if flag(facebook)
-       ghc-options: -DGLEAN_FACEBOOK
     build-depends:
         glean:cli-types,
         glean:client-hs,

glean/db/Glean/Database/Config.hs

@@ -8,35 +8,41 @@
 
 {-# LANGUAGE ApplicativeDo, CPP #-}
 module Glean.Database.Config (
+  -- * DataStore
   DataStore(..),
   fileDataStore,
   tmpDataStore,
   memoryDataStore,
+
+  -- * Config, and options parser
+  options,
   Config(..),
+  DebugFlags(..),
+
+  -- * Finding and parsing the schema
   ServerConfig.SchemaLocation(..),
   showSchemaLocation,
   schemaLocation,
   schemaLocationOption,
-  DebugFlags(..),
-  options,
   processSchema,
   processSchemaCached,
   processOneSchema,
   SchemaIndex(..),
   schemaForSchemaId,
   ProcessedSchema(..),
-  schemaSourceIndexConfig,
   catSchemaFiles,
   schemaLocationToSource,
-  schemaLocationFiles,
-  schemaSourceFilesFromDir,
-  schemaSourceDir,
-  schemaSourceFile,
-  schemaSourceIndexFile,
   parseSchemaDir,
   parseSchemaIndex,
-  -- testing
+  loadSchemaIndex,
+
+  -- * Testing only
+
+  -- if you're using these somewhere other than a test,
+  -- you should probably be using something from the API above instead.
   processSchemaForTesting,
+  schemaLocationFiles,
+  schemaSourceDir,
 ) where
 
 import Control.Exception
@@ -426,6 +432,16 @@ schemaLocation cfg server_cfg = do
     other ->
       return other
 
+-- | Find and load the SchemaIndex, taking into account command line
+-- flags, the ServerConfig, and the cfgSchemaHook. This is a
+-- convenience function used by the CLI.
+loadSchemaIndex :: ConfigProvider c => Config -> c -> IO SchemaIndex
+loadSchemaIndex cfg cfgAPI = do
+  serverConfig <- ThriftSource.load cfgAPI (cfgServerConfig cfg)
+  loc <- schemaLocation cfg serverConfig
+  let (schemaSource, _) = cfgSchemaHook cfg loc
+  ThriftSource.load cfgAPI schemaSource
+
 showSchemaLocation :: ServerConfig.SchemaLocation -> String
 showSchemaLocation = \case
   ServerConfig.SchemaLocation_dir d -> "dir:" <> Text.unpack d

glean/db/Glean/Database/Schema.hs

@@ -16,8 +16,6 @@ module Glean.Database.Schema
   , newDbSchema
   , newMergedDbSchema
   , mkDbSchemaFromSource
-  , mkDbSchema
-  , findSchemaInIndex
   , lookupPid
   , compareSchemaPredicates
   , validateNewSchema

glean/db/Glean/Database/Util.hs

@@ -50,7 +50,6 @@ import qualified Glean.Types as Thrift
 import Glean.Impl.ConfigProvider
 import Glean.Util.ConfigProvider
 import Glean.Util.ShellPrint
-import qualified Glean.Util.ThriftSource as ThriftSource
 import Glean.Shell
 
 import GleanCLI.Backup
@@ -661,11 +660,9 @@ instance Plugin WriteSerializedInventoryCommand where
         let cfg = case svc of
               Glean.Local cfg _ -> cfg
               Glean.Remote{} -> def
-        serverConfig <- ThriftSource.load cfgAPI (cfgServerConfig cfg)
-        loc <- GleanDB.schemaLocation cfg serverConfig
-        let (schemaSource, _) = GleanDB.cfgSchemaHook cfg loc
-        index <- ThriftSource.load cfgAPI schemaSource
-        dbSchema <- newDbSchema Nothing index selector readWriteContent def
+        index <- GleanDB.loadSchemaIndex cfg cfgAPI
+        dbSchema <- newDbSchema Nothing index selector
+          readWriteContent def
         return $ Inventory.serialize $ schemaInventory dbSchema
 
     inventory <- case writeSerializedInventoryFrom of