Skip to content

Commit

Permalink
ci build with webly
Browse files Browse the repository at this point in the history
  • Loading branch information
awb99 committed Apr 3, 2024
1 parent ba820dc commit 9d5b9f7
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 24 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Expand Up @@ -31,7 +31,7 @@ jobs:
shell: bash
- name: Install dependencies
run: |
clojure -X:goldly-build :profile '"npm-install"'
clojure -X:webly:npm-install
./scripts/copy_res.sh
#- name: clj-kondo
# run: clojure -M:lint
Expand All @@ -47,6 +47,5 @@ jobs:
run: |
git config --global user.email "ci@pinkgorilla.org"
git config --global user.name "CI/CD"
rm src/goldly_bindings_generated.cljs
clojure -T:build jar
clojure -T:build deploy
2 changes: 1 addition & 1 deletion build.clj
Expand Up @@ -5,7 +5,7 @@
[deps-deploy.deps-deploy :as dd]))

(def lib 'org.pinkgorilla/ui-input)
(def version (format "0.1.%s" (b/git-count-revs nil)))
(def version (format "0.2.%s" (b/git-count-revs nil)))
(def class-dir "target/classes")
(def basis (b/create-basis {:project "deps.edn"}))
(def jar-file (format "target/%s-%s.jar" (name lib) version))
Expand Down
32 changes: 22 additions & 10 deletions deps.edn
Expand Up @@ -33,16 +33,28 @@

; ci

:goldly-build ; ci only
{:extra-paths ["target/webly" ; to include the sci-bindings info
"demo/src"
"demo/resources"]
:extra-deps {org.pinkgorilla/goldly {:mvn/version "0.4.635"}
}
:exec-fn goldly.app.build/goldly-build
:exec-args {:profile "npm-install"
:config ["webly/config.edn" "goldly/config.edn" "demo/config.edn"]}}

:webly {:extra-deps {org.pinkgorilla/webly {:mvn/version "0.5.657"}
org.pinkgorilla/ui-repl {:mvn/version "0.1.92"}
org.pinkgorilla/ui-input {:mvn/version "0.0.29"} ; react-spaces rnd ...
}
:exec-fn webly.app.app/webly-build
:exec-args {:config [{: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"}}}]
:profile "npm-install"}}

:npm-install {:exec-args {:profile "npm-install"}}
:compile {:exec-args {:profile "compile2"}}
:release {:exec-args {:profile "release"}}
:release-adv {:exec-args {:profile "release-adv"}}
:static {:exec-args {:profile "static"}}
:ci {:exec-args {:profile "ci"}}

; for demo see README.md or go to "demo" folder and run aliases there.

;
Expand Down
2 changes: 1 addition & 1 deletion resources/ext/ui-spaces.edn
Expand Up @@ -4,7 +4,7 @@
:cljs-namespace [spaces.core
spaces.layout.fixed
spaces.layout.screen]
:cljs-ns-bindings {'spaces {;; top-level-spaces ;; spaces is depreciated. use spaces.core
:cljs-ns-bindings {'spaces {;; spaces is depreciated. use spaces.core
'viewport spaces.core/viewport
'fixed spaces.core/fixed
;; anchored-spaces
Expand Down
5 changes: 0 additions & 5 deletions scripts/compile_adv_run.sh

This file was deleted.

5 changes: 0 additions & 5 deletions scripts/compile_run.sh

This file was deleted.

0 comments on commit 9d5b9f7

Please sign in to comment.