From f91e6934df8bfb00a81bc64bd1b84e84ead47341 Mon Sep 17 00:00:00 2001
From: Matthew Conolly <matthew.conolly@sifive.com>
Date: Thu, 25 Jun 2020 17:03:21 -0700
Subject: [PATCH 1/3] Publish the location of the ivpdependencies.json

---
 build.wake        | 1 +
 wit-manifest.json | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/build.wake b/build.wake
index a5466ad4ac6..eaf61865e0e 100644
--- a/build.wake
+++ b/build.wake
@@ -1,5 +1,6 @@
 
 global def rocketChipRoot = here
+publish ivyDepLocations = rocketChipRoot, Nil
 
 global def hardfloatScalaModule =
   makeScalaModuleFromJSON here "hardfloat"
diff --git a/wit-manifest.json b/wit-manifest.json
index 14c3a8eb8ab..fc0e9e71c27 100644
--- a/wit-manifest.json
+++ b/wit-manifest.json
@@ -28,5 +28,10 @@
         "commit": "d619ca850846d2ec36da64bf8a28e7d9a3d9ed1b",
         "name": "api-config-chipsalliance",
         "source": "git@github.com:chipsalliance/api-config-chipsalliance.git"
+    },
+    {
+        "commit": "771f11581b86079bf3411f85ce77495e7444c08e",
+        "name": "api-scala-sifive",
+        "source": "git@github.com:sifive/api-scala-sifive.git"
     }
 ]

From 60c0850e2e3c72ced02b4131e152371fd45ab318 Mon Sep 17 00:00:00 2001
From: Matthew Conolly <matthew.conolly@sifive.com>
Date: Thu, 25 Jun 2020 18:35:41 -0700
Subject: [PATCH 2/3] Use wake 0.17.2 for wake compilation check in CI

---
 ci-tests/wake_scala_compilation | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci-tests/wake_scala_compilation b/ci-tests/wake_scala_compilation
index 0a8b373525a..af27183c171 100755
--- a/ci-tests/wake_scala_compilation
+++ b/ci-tests/wake_scala_compilation
@@ -3,8 +3,8 @@ set -ex
 
 echo "Installing Wake"
 
-wget https://github.com/sifive/wake/releases/download/v0.15.1/ubuntu-16.04-wake_0.15.1-1_amd64.deb
-sudo dpkg -i ubuntu-16.04-wake_0.15.1-1_amd64.deb
+wget https://github.com/sifive/wake/releases/download/v0.17.2/ubuntu-16-04-wake_0.17.2-1_amd64.deb
+sudo dpkg -i ubuntu-16-04-wake_0.17.2-1_amd64.deb
 
 
 echo "Installing Protobuf"

From 1df93f349ddc61b84132d1a55c0c9203ce317dfe Mon Sep 17 00:00:00 2001
From: Matthew Conolly <matthew.conolly@sifive.com>
Date: Thu, 25 Jun 2020 18:46:49 -0700
Subject: [PATCH 3/3] Wake no longer has '-j' option

---
 ci-tests/wake_scala_compilation | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci-tests/wake_scala_compilation b/ci-tests/wake_scala_compilation
index af27183c171..0d11c16dc41 100755
--- a/ci-tests/wake_scala_compilation
+++ b/ci-tests/wake_scala_compilation
@@ -34,5 +34,5 @@ echo "Compile Scala"
 
 export WAKE_PATH=$PATH
 wake --init .
-wake --no-tty -j1 -dv 'compileScalaModule rocketchipScalaModule | getPathResult'
+wake --no-tty -p1 -dv 'compileScalaModule rocketchipScalaModule | getPathResult'
 cd ..