Skip to content

Commit

Permalink
switch to OS X runner, use stable WebKit tag, drop lein - use depstar…
Browse files Browse the repository at this point in the history
… for uberjar step
  • Loading branch information
swannodette committed Mar 16, 2021
1 parent a752299 commit 3fdaabe
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 9 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ci/install_jsc.sh
Original file line number Diff line number Diff line change
@@ -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 ..
Expand Down
5 changes: 4 additions & 1 deletion deps.edn
Original file line number Diff line number Diff line change
Expand Up @@ -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}}}}
3 changes: 1 addition & 2 deletions script/uberjar
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3fdaabe

Please sign in to comment.