From 81478b4dbeac8bf97bb55c371c5bddbbc34fd6d3 Mon Sep 17 00:00:00 2001
From: Alex Cameron <asc@tetsuo.sh>
Date: Wed, 8 Jun 2022 07:07:13 +1000
Subject: [PATCH] Add LLVM 14 to CI (#598)

* Add LLVM 14 to CI

* Update `build.sh`

* Fix docker entrypoint

Co-authored-by: Eric Kilmer <eric.d.kilmer@gmail.com>
---
 .github/workflows/ci.yml            |  6 +++---
 scripts/build.sh                    | 10 +++++-----
 scripts/docker-lifter-entrypoint.sh |  3 +++
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ba0225cdd..e92c971ac 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
       matrix:
         image:
           - { name: 'ubuntu', tag: '20.04' }
-        llvm: ['13']
+        llvm: ['13', '14']
 
     runs-on: ubuntu-20.04
     container:
@@ -94,7 +94,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ['macos-11']
-        llvm: ['13']
+        llvm: ['13', '14']
 
     runs-on: ${{ matrix.os }}
 
@@ -215,7 +215,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        llvm: ["13"]
+        llvm: ["13", "14"]
         ubuntu: ["20.04"]
     steps:
     - uses: actions/checkout@v2
diff --git a/scripts/build.sh b/scripts/build.sh
index 561374621..a8b3bbe70 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -23,7 +23,7 @@ DOWNLOAD_DIR="$( cd "$( dirname "${SRC_DIR}" )" && pwd )/lifting-bits-downloads"
 CURR_DIR=$( pwd )
 BUILD_DIR="${CURR_DIR}/remill-build"
 INSTALL_DIR=/usr/local
-LLVM_VERSION=llvm-13
+LLVM_VERSION=llvm-14
 OS_VERSION=
 ARCH_VERSION=
 BUILD_FLAGS=
@@ -272,14 +272,14 @@ function Package
 function GetLLVMVersion
 {
   case ${1} in
-    12)
-      LLVM_VERSION=llvm-12
-      return 0
-    ;;
     13)
       LLVM_VERSION=llvm-13
       return 0
     ;;
+    14)
+      LLVM_VERSION=llvm-14
+      return 0
+    ;;
     *)
       # unknown option
       echo "[x] Unknown or unsupported LLVM version ${1}. You may be able to manually build it with cxx-common."
diff --git a/scripts/docker-lifter-entrypoint.sh b/scripts/docker-lifter-entrypoint.sh
index 5a21d6b76..c4ec830eb 100755
--- a/scripts/docker-lifter-entrypoint.sh
+++ b/scripts/docker-lifter-entrypoint.sh
@@ -49,6 +49,9 @@ case ${LLVM_VERSION} in
   llvm13*)
     V=13
   ;;
+  llvm14*)
+    V=14
+  ;;
   *)
     echo "Unknown LLVM version: ${LLVM_VERSION}"
     exit 1