Skip to content

Commit

Permalink
ci improved
Browse files Browse the repository at this point in the history
  • Loading branch information
awb99 committed Apr 14, 2024
1 parent aea9251 commit 4f15324
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 19 deletions.
7 changes: 1 addition & 6 deletions .github/workflows/static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,7 @@ jobs:
- name: build gh-pages
if: success()
run: |
cd demo
clojure -X:webly:npm-install
clojure -X:webly:release-adv
clojure -X:webly:static
clojure -X:nbeval
cp target/webly/public/rdocument target/static/r -r
./static.sh
- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion demo/deps.edn
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
:deps
{org.pinkgorilla/reval {:local/root "../reval" :deps/manifest :deps}
org.pinkgorilla/reval-ui {:local/root "../reval-ui" :deps/manifest :deps}
org.pinkgorilla/webly {:mvn/version "0.5.661"}
org.pinkgorilla/webly {:mvn/version "0.5.662"}
; ui modules for demo notebooks:
org.pinkgorilla/ui-highcharts {:mvn/version "0.0.28"}
}
Expand Down
11 changes: 3 additions & 8 deletions demo/resources/reval/demo-config.edn
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
{:build {:disabled-extensions #{; extensions using sci-configs will not work in webly.
"reagent" "re-frame"
"funcool-promesa"
"applied-science.js-interop"
; webly2 is now in webly. needs to be removed from ui-repl.
"webly2"
"ui-repl"
"cljs-ajax"
{:build {:disabled-extensions #{
;"webly2"
;"cljs-ajax"
}}

:reval {:rdocument {:storage-root "target/webly/public/rdocument/"
Expand Down
2 changes: 1 addition & 1 deletion reval-ui/build.clj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[clojure.string :as str]
[clojure.tools.build.api :as b]
[org.corfield.build :as bb] ; https://github.com/seancorfield/build-clj
[modular.date :refer [now-str]]))
))

(def lib 'org.pinkgorilla/reval)
(def version (format "0.6.%s" (b/git-count-revs nil)))
Expand Down
4 changes: 2 additions & 2 deletions reval-ui/deps.edn
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
:deps
{org.pinkgorilla/reval {:local/root "../reval" :deps/manifest :deps}
; deps to ui extensions used in reval
org.pinkgorilla/pinkie {:mvn/version "0.5.231"}; error boundary
org.pinkgorilla/ui-repl {:mvn/version "0.1.96"} ; reagent
org.pinkgorilla/pinkie {:mvn/version "0.5.231"} ; error boundary
org.pinkgorilla/ui-repl {:mvn/version "0.1.98"} ; reagent
org.pinkgorilla/ui-input {:mvn/version "0.2.44"} ; spaces
org.pinkgorilla/ui-codemirror {:mvn/version "0.1.48"}
org.pinkgorilla/ui-highlightjs {:mvn/version "0.0.9"}
Expand Down
1 change: 0 additions & 1 deletion reval/deps.edn
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{:paths ["src"]
:deps
{org.clojure/clojure {:mvn/version "1.11.1"}
org.clojure/core.async {:mvn/version "1.6.673"}
org.clojure/data.codec {:mvn/version "0.1.1"} ; image base64 encoding
rewrite-clj/rewrite-clj {:mvn/version "1.1.47"}
org.pinkgorilla/modular {:mvn/version "0.0.40"}
Expand Down
Empty file.
14 changes: 14 additions & 0 deletions static.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/bin/sh
cd demo
rm target -r
rm .shadow-cljs -r
rm .cpcache -r
rm package.json
rm package-lock.json
rm shadow-cljs.edn
rm karma.conf.js
clojure -X:webly:npm-install
clojure -X:webly:release-adv
clojure -X:webly:static
clojure -X:nbeval
cp target/webly/public/rdocument target/static/r -r

0 comments on commit 4f15324

Please sign in to comment.