Skip to content

Commit

Permalink
webly removed, ci fixed.
Browse files Browse the repository at this point in the history
  • Loading branch information
awb99 committed Apr 2, 2024
1 parent 3b6cc73 commit 43fc4f0
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 59 deletions.
12 changes: 3 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
# run: clojure -M:garamond
- name: npm-install
run: |
clojure -X:goldly:build
clojure -X:goldly:gbuild
# ./scripts/copy_res.sh
#- name: clj-kondo
# run: clojure -M:lint
Expand All @@ -59,11 +59,5 @@ jobs:
git config --global user.email "ci@pinkgorilla.org"
git config --global user.name "CI/CD"
rm src/goldly_bindings_generated.cljs
clojure -M:release --patch
git push --tags
# clojure -M:release tag --minor
# clojure -M:release pom
# clojure -M:release jar
# clojure -M:release deploy
# lein release
# bash <(curl -s https://codecov.io/bash)
clojure -T:build jar
clojure -T:build deploy
50 changes: 50 additions & 0 deletions build.clj
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
(ns build
(:require
[babashka.fs :as fs]
[clojure.tools.build.api :as b]
[deps-deploy.deps-deploy :as dd]))

(def lib 'org.pinkgorilla/ui-repl)
(def version (format "0.1.%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))

(defn clean [_]
(b/delete {:path "target"}))

(def pom-template
[[:licenses
[:license
[:name "Eclipse Public License"]
[:url "https://www.eclipse.org/legal/epl-v10.html"]]]
[:developers
[:developer
[:name "pink-gorilla"]]]
[:scm
[:url "https://github.com/pink-gorilla/ui-repl/"]
[:connection "scm:git:git://github.com/pink-gorilla/ui-repl.git"]
[:developerConnection "scm:git:ssh://git@github.com/pink-gorilla/ui-repl.git"]]])

(def opts {:class-dir class-dir
:lib lib
:version version
:basis basis
:pom-data pom-template
:src-dirs ["src"]})

(defn jar [_]
(b/write-pom opts)
(b/copy-dir {:src-dirs ["src"
"resources"]
:target-dir class-dir})
(b/jar {:class-dir class-dir
:jar-file jar-file}))

(defn deploy "Deploy the JAR to Clojars." [_]
(println "Deploying to Clojars..")
(dd/deploy {:installer :remote
;:sign-releases? true
:pom-file (b/pom-path (select-keys opts [:lib :class-dir]))
;:artifact "target/tech.ml.dataset.jar"
:artifact (b/resolve-path jar-file)}))
23 changes: 8 additions & 15 deletions deps.edn
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
com.cemerick/url {:mvn/version "0.1.1"} ; url links
applied-science/js-interop {:mvn/version "0.3.3"}
funcool/promesa {:mvn/version "11.0.674"}

; sci configs is working with this versions:
; applied-science/js-interop {:mvn/version "0.3.3"}
; funcool/promesa {:mvn/version "9.0.494"}
Expand All @@ -26,12 +25,7 @@
; you'll need the version the closure compiler expects
}
:aliases
{;https://github.com/applied-science/deps-library
:release
{:extra-deps {applied-science/deps-library {:mvn/version "0.4.0"}}
:main-opts ["-m" "applied-science.deps-library"]}

; https://github.com/weavejester/cljfmt
{; https://github.com/weavejester/cljfmt
:cljfmt
{:extra-deps {cljfmt/cljfmt {:mvn/version "RELEASE"}}
:main-opts ["-m" "cljfmt.main" "check" "--indents" "cljfmt.edn"]}
Expand All @@ -52,10 +46,7 @@
{:extra-deps {athos/clj-check {:git/url "https://github.com/athos/clj-check.git"
:sha "0ca84df1357d71429243b99908303f45a934654c"}}
:main-opts ["-m" "clj-check.check"]}

:garamond
{:extra-deps {com.workframe/garamond {:mvn/version "0.4.0"}}
:main-opts ["-m" "garamond.main"]}


:goldly
{:extra-paths ["target/webly" ; to include the sci-bindings info
Expand All @@ -72,7 +63,7 @@
:services "goldly/services.edn"
:config ["webly/config.edn" "goldly/config.edn" "repl-config.edn"]}}

:build
:gbuild
{:exec-fn goldly.app.build/goldly-build
:exec-args {:profile "npm-install"}}

Expand All @@ -84,9 +75,11 @@
{:exec-fn goldly.app.build/goldly-build
:exec-args {:profile "compile2"}}

:test-addlib
{:extra-paths ["dev"]
:main-opts ["-m" "add-lib-demo"]}
:build {:deps {io.github.clojure/tools.build {:mvn/version "0.9.6"}
slipset/deps-deploy {:mvn/version "0.2.1"}
babashka/fs {:mvn/version "0.0.5"}}
:ns-default build}


;
}}
11 changes: 0 additions & 11 deletions dev/add_lib_demo.clj

This file was deleted.

4 changes: 0 additions & 4 deletions release.edn

This file was deleted.

20 changes: 0 additions & 20 deletions src/pinkgorilla/repl/cljs/webly.cljs

This file was deleted.

0 comments on commit 43fc4f0

Please sign in to comment.