From 3fdaabedb1343f434b6cb4f75fa28e748f96eff0 Mon Sep 17 00:00:00 2001
From: David Nolen <david.nolen@gmail.com>
Date: Tue, 16 Mar 2021 11:10:52 -0400
Subject: [PATCH] switch to OS X runner, use stable WebKit tag, drop lein - use
 depstar for uberjar step

---
 .github/workflows/test.yaml | 10 +++++-----
 ci/install_jsc.sh           |  2 +-
 deps.edn                    |  5 ++++-
 script/uberjar              |  3 +--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index a8a7e46b79..c264439fcd 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -5,7 +5,7 @@ jobs:
   # Runtime Tests
   runtime-test:
     name: Runtime Tests
-    runs-on: ubuntu-16.04
+    runs-on: macos-10.15
     steps:
       - uses: actions/checkout@v2
 
@@ -57,7 +57,7 @@ jobs:
   # Self-host Tests
   self-host-test:
     name: Self-host Tests
-    runs-on: ubuntu-16.04
+    runs-on: macos-10.15
     steps:
       - uses: actions/checkout@v2
 
@@ -96,7 +96,7 @@ jobs:
   # Self-parity Tests
   self-parity-test:
     name: Self-parity Tests
-    runs-on: ubuntu-16.04
+    runs-on: macos-10.15
     steps:
       - uses: actions/checkout@v2
 
@@ -135,7 +135,7 @@ jobs:
   # Compiler Tests
   compiler-test:
     name: Compiler Tests
-    runs-on: ubuntu-16.04
+    runs-on: macos-10.15
     steps:
       - uses: actions/checkout@v2
 
@@ -169,7 +169,7 @@ jobs:
   # CLI Tests
   cli-test:
     name: CLI Tests
-    runs-on: ubuntu-16.04
+    runs-on: macos-10.15
     steps:
       - uses: actions/checkout@v2
         with:
diff --git a/ci/install_jsc.sh b/ci/install_jsc.sh
index ed2fd3cb2c..b5255c94c7 100755
--- a/ci/install_jsc.sh
+++ b/ci/install_jsc.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 if [ ! -d WebKit ]
 then
-  git clone -b Safari-611.1.5.1 --depth=1 git@github.com:WebKit/WebKit.git WebKit;
+  git clone -b Safari-611.1.5.1 --depth=1 https://github.com/WebKit/WebKit.git WebKit;
   cd WebKit;
   Tools/Scripts/build-jsc --jsc-only;
   cd ..
diff --git a/deps.edn b/deps.edn
index b02f395724..85dd955317 100644
--- a/deps.edn
+++ b/deps.edn
@@ -24,4 +24,7 @@
   :selfparity.test.build {:extra-paths ["src/test/self"]
                           :main-opts ["-i" "src/test/self/self_parity/setup.clj"
                                       "-e" "(self-parity.setup/-main)"
-                                      "-m" "cljs.main" "-co" "resources/self_parity_test.edn" "-c"]}}}
+                                      "-m" "cljs.main" "-co" "resources/self_parity_test.edn" "-c"]}
+  :uberjar               {:extra-deps {com.github.seancorfield/depstar {:mvn/version "2.0.193"}}
+                          :exec-fn hf.depstar/uberjar
+                          :exec-args {:aot true}}}}
diff --git a/script/uberjar b/script/uberjar
index 7ab7b78c87..83d685e81e 100755
--- a/script/uberjar
+++ b/script/uberjar
@@ -52,8 +52,7 @@ AOT_CACHE_FILE=`mktemp /tmp/core.cljs.cache.aot.edn.XXXXXXXXXXX`
 sed -e "s/0.0.0000/$MAJOR.$MINOR-$REVISION/" src/main/cljs/cljs/core.cljs.cache.aot.edn > $AOT_CACHE_FILE
 mv $AOT_CACHE_FILE src/main/cljs/cljs/core.cljs.cache.aot.edn
 
-lein uberjar
-mv target/clojurescript-0.0-SNAPSHOT-standalone.jar target/cljs.jar
+clojure -X:uberjar :jar target/cljs.jar :compile-ns :all
 
 rm -f src/main/cljs/cljs/core.aot.js
 rm -f src/main/cljs/cljs/core.aot.js.map