fixes the raw (non directory or zip, but file) recipes (#1562)

* fixes the raw (non directory or zip, but file) recipes

* drops llvm depext (as it already should come from bap-conf-llvm)

* switch from ubuntu-latest to focal

* downgrades macos workers from latest to 11

Author: ivg

.github/workflows/build-dev-repo.yml

@@ -8,14 +8,14 @@ jobs:
     strategy:
       matrix:
         os:
-          - ubuntu-latest
-          - macos-latest
+          - ubuntu-20.04
+          - macos-11
         ocaml-compiler:
           - 4.11.x
           - 4.08.x
 
     runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.os == 'macos-latest'}}
+    continue-on-error: ${{ matrix.os == 'macos-11'}}
 
     env:
       TMPDIR: /tmp
@@ -32,7 +32,7 @@ jobs:
         uses: ocaml/setup-ocaml@v2
         with:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
-          dune-cache: ${{  matrix.os != 'macos-latest' }}
+          dune-cache: ${{  matrix.os != 'macos-11' }}
 
       - name: Add the testing Repository
         run: opam repo add bap git+https://github.com/BinaryAnalysisPlatform/opam-repository#testing
@@ -41,7 +41,7 @@ jobs:
         run: opam pin add bap . --no-action
 
       - name: Configure Homebrew LLVM
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-11'
         run: |
           rm -rf /usr/local/bin/2to3
           rm -f $(opam var lib)/ocaml/version

lib/bap_recipe/bap_recipe.ml

@@ -110,7 +110,7 @@ let input file parse root =
   let path = root.path / file in
   if Sys.file_exists path
   then parse (In_channel.read_all path)
-  else Error (Missing_entry file)
+  else Error (Missing_entry path)
 
 let parse_recipe str =
   match Parsexp.Many.parse_string str with
@@ -195,8 +195,12 @@ let read t = match target_format t with
     let path = mkdtemp ~prefix:"recipe-" ~suffix:".unzipped" () in
     unzip t path;
     {path; temp=true; main="recipe.scm"}
-  | Raw -> {path=Filename.dirname t; temp=false; main=t}
   | Dir -> {path=t; temp=false; main="recipe.scm"}
+  | Raw -> {
+      path=Filename.dirname t;
+      temp=false;
+      main=Filename.basename t
+    }
 
 let check_vars env spec loads =
   let specs = spec :: List.map loads ~f:(fun s -> s.spec) in

opam/opam

@@ -305,7 +305,6 @@ depexts: [
     "libgmp-dev"
     "libzip-dev"
     "libcurl4-gnutls-dev"
-    "llvm-9-dev"
     "time"
     "clang"
     "m4"