Skip to content

Commit 3fdaabe

Browse files
committed
switch to OS X runner, use stable WebKit tag, drop lein - use depstar for uberjar step
1 parent a752299 commit 3fdaabe

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

Diff for: .github/workflows/test.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
# Runtime Tests
66
runtime-test:
77
name: Runtime Tests
8-
runs-on: ubuntu-16.04
8+
runs-on: macos-10.15
99
steps:
1010
- uses: actions/checkout@v2
1111

@@ -57,7 +57,7 @@ jobs:
5757
# Self-host Tests
5858
self-host-test:
5959
name: Self-host Tests
60-
runs-on: ubuntu-16.04
60+
runs-on: macos-10.15
6161
steps:
6262
- uses: actions/checkout@v2
6363

@@ -96,7 +96,7 @@ jobs:
9696
# Self-parity Tests
9797
self-parity-test:
9898
name: Self-parity Tests
99-
runs-on: ubuntu-16.04
99+
runs-on: macos-10.15
100100
steps:
101101
- uses: actions/checkout@v2
102102

@@ -135,7 +135,7 @@ jobs:
135135
# Compiler Tests
136136
compiler-test:
137137
name: Compiler Tests
138-
runs-on: ubuntu-16.04
138+
runs-on: macos-10.15
139139
steps:
140140
- uses: actions/checkout@v2
141141

@@ -169,7 +169,7 @@ jobs:
169169
# CLI Tests
170170
cli-test:
171171
name: CLI Tests
172-
runs-on: ubuntu-16.04
172+
runs-on: macos-10.15
173173
steps:
174174
- uses: actions/checkout@v2
175175
with:

Diff for: ci/install_jsc.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22
if [ ! -d WebKit ]
33
then
4-
git clone -b Safari-611.1.5.1 --depth=1 git@github.com:WebKit/WebKit.git WebKit;
4+
git clone -b Safari-611.1.5.1 --depth=1 https://github.com/WebKit/WebKit.git WebKit;
55
cd WebKit;
66
Tools/Scripts/build-jsc --jsc-only;
77
cd ..

Diff for: deps.edn

+4-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,7 @@
2424
:selfparity.test.build {:extra-paths ["src/test/self"]
2525
:main-opts ["-i" "src/test/self/self_parity/setup.clj"
2626
"-e" "(self-parity.setup/-main)"
27-
"-m" "cljs.main" "-co" "resources/self_parity_test.edn" "-c"]}}}
27+
"-m" "cljs.main" "-co" "resources/self_parity_test.edn" "-c"]}
28+
:uberjar {:extra-deps {com.github.seancorfield/depstar {:mvn/version "2.0.193"}}
29+
:exec-fn hf.depstar/uberjar
30+
:exec-args {:aot true}}}}

Diff for: script/uberjar

+1-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ AOT_CACHE_FILE=`mktemp /tmp/core.cljs.cache.aot.edn.XXXXXXXXXXX`
5252
sed -e "s/0.0.0000/$MAJOR.$MINOR-$REVISION/" src/main/cljs/cljs/core.cljs.cache.aot.edn > $AOT_CACHE_FILE
5353
mv $AOT_CACHE_FILE src/main/cljs/cljs/core.cljs.cache.aot.edn
5454

55-
lein uberjar
56-
mv target/clojurescript-0.0-SNAPSHOT-standalone.jar target/cljs.jar
55+
clojure -X:uberjar :jar target/cljs.jar :compile-ns :all
5756

5857
rm -f src/main/cljs/cljs/core.aot.js
5958
rm -f src/main/cljs/cljs/core.aot.js.map

0 commit comments

Comments
 (0)