From a09d9938406c2a9123ccc64b26221f13260c9540 Mon Sep 17 00:00:00 2001
From: Adrian Palacios <accorell@amazon.com>
Date: Fri, 28 May 2021 15:57:13 +0000
Subject: [PATCH 1/2] Install CBMC viewer in CI

---
 .github/workflows/rmc.yml                  | 3 +++
 scripts/setup/install_viewer.sh            | 9 +++++++++
 scripts/setup/macos-10.15/install_deps.sh  | 1 +
 scripts/setup/ubuntu-20.04/install_deps.sh | 1 +
 4 files changed, 14 insertions(+)
 create mode 100755 scripts/setup/install_viewer.sh

diff --git a/.github/workflows/rmc.yml b/.github/workflows/rmc.yml
index 49a7b7b4728f..54e1b27d3612 100644
--- a/.github/workflows/rmc.yml
+++ b/.github/workflows/rmc.yml
@@ -20,6 +20,9 @@ jobs:
 
       - name: Install CBMC
         run: ./scripts/setup/${{ matrix.os }}/install_cbmc.sh
+      
+      - name: Install cbmc-viewer
+        run: ./scripts/setup/install_viewer.sh
 
       - name: Install Rust toolchain
         run: ./scripts/setup/install_rustup.sh
diff --git a/scripts/setup/install_viewer.sh b/scripts/setup/install_viewer.sh
new file mode 100755
index 000000000000..8a07345ea717
--- /dev/null
+++ b/scripts/setup/install_viewer.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+
+set -eux
+
+# Install cbmc-viewer 2.5
+wget https://github.com/awslabs/aws-viewer-for-cbmc/releases/download/viewer-2.5/cbmc_viewer-2.5-py3-none-any.whl \
+  && sudo python3 -m pip install --upgrade cbmc_viewer-2.5-py3-none-any.whl
diff --git a/scripts/setup/macos-10.15/install_deps.sh b/scripts/setup/macos-10.15/install_deps.sh
index ea346a820752..5b98255e5c19 100755
--- a/scripts/setup/macos-10.15/install_deps.sh
+++ b/scripts/setup/macos-10.15/install_deps.sh
@@ -6,3 +6,4 @@ set -eux
 
 # Update tools in macOS 10.15 via `brew`
 brew update
+brew install ctags
diff --git a/scripts/setup/ubuntu-20.04/install_deps.sh b/scripts/setup/ubuntu-20.04/install_deps.sh
index 1ed1fca226a5..588758fa88c2 100755
--- a/scripts/setup/ubuntu-20.04/install_deps.sh
+++ b/scripts/setup/ubuntu-20.04/install_deps.sh
@@ -10,6 +10,7 @@ sudo apt-get --yes update \
   bison \
   cmake \
   curl \
+  ctags \
   flex \
   g++ \
   gcc \

From 35b455161950526f2c3e1aaa4be18e29ec0d4961 Mon Sep 17 00:00:00 2001
From: Adrian Palacios <accorell@amazon.com>
Date: Mon, 31 May 2021 09:41:35 +0000
Subject: [PATCH 2/2] Require cbmc-viewer version for installation

---
 .github/workflows/rmc.yml                  |  2 +-
 scripts/setup/install_viewer.sh            | 11 ++++++++---
 scripts/setup/ubuntu-20.04/install_deps.sh |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/rmc.yml b/.github/workflows/rmc.yml
index 54e1b27d3612..d5d0c651972d 100644
--- a/.github/workflows/rmc.yml
+++ b/.github/workflows/rmc.yml
@@ -22,7 +22,7 @@ jobs:
         run: ./scripts/setup/${{ matrix.os }}/install_cbmc.sh
       
       - name: Install cbmc-viewer
-        run: ./scripts/setup/install_viewer.sh
+        run: ./scripts/setup/install_viewer.sh 2.5
 
       - name: Install Rust toolchain
         run: ./scripts/setup/install_rustup.sh
diff --git a/scripts/setup/install_viewer.sh b/scripts/setup/install_viewer.sh
index 8a07345ea717..add257019eda 100755
--- a/scripts/setup/install_viewer.sh
+++ b/scripts/setup/install_viewer.sh
@@ -4,6 +4,11 @@
 
 set -eux
 
-# Install cbmc-viewer 2.5
-wget https://github.com/awslabs/aws-viewer-for-cbmc/releases/download/viewer-2.5/cbmc_viewer-2.5-py3-none-any.whl \
-  && sudo python3 -m pip install --upgrade cbmc_viewer-2.5-py3-none-any.whl
+# Install cbmc-viewer
+if [[ $# -eq 1 ]] ; then
+wget https://github.com/awslabs/aws-viewer-for-cbmc/releases/download/viewer-$1/cbmc_viewer-$1-py3-none-any.whl \
+  && sudo python3 -m pip install --upgrade cbmc_viewer-$1-py3-none-any.whl
+else
+  echo "Error: Specify the version to install"
+  exit 1
+fi
diff --git a/scripts/setup/ubuntu-20.04/install_deps.sh b/scripts/setup/ubuntu-20.04/install_deps.sh
index 588758fa88c2..b7f38342fabc 100755
--- a/scripts/setup/ubuntu-20.04/install_deps.sh
+++ b/scripts/setup/ubuntu-20.04/install_deps.sh
@@ -9,8 +9,8 @@ sudo apt-get --yes update \
   && sudo DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --yes \
   bison \
   cmake \
-  curl \
   ctags \
+  curl \
   flex \
   g++ \
   gcc \