Skip to content

Commit

Permalink
ci fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
awb99 committed Apr 22, 2024
1 parent 7932eb4 commit 9ddbcfb
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 57 deletions.
8 changes: 2 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@ jobs:
shell: bash
- name: test-clj
run: clojure -M:test
#- name: clj-kondo
# run: clojure -M:lint
#- name: cloverage
# run: clojure -M:cloverage
- name: Release
if: success()
# if: github.event_name == 'push'
Expand All @@ -46,5 +42,5 @@ jobs:
run: |
git config --global user.email "[email protected]"
git config --global user.name "CI/CD"
clojure -M:release --patch
git push --tags
clojure -T:build jar
clojure -T:build deploy
29 changes: 0 additions & 29 deletions .github/workflows/pr.yml

This file was deleted.

48 changes: 48 additions & 0 deletions build.clj
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
(ns build
(:require
[clojure.tools.build.api :as b]
[deps-deploy.deps-deploy :as dd]))

(def lib 'org.pinkgorilla/modular)
(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))

(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/modular"]
[:connection "scm:git:git://github.com/pink-gorilla/modular.git"]
[:developerConnection "scm:git:ssh://[email protected]/pink-gorilla/modular.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)}))
24 changes: 5 additions & 19 deletions deps.edn
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,11 @@
}

: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"]}
{; github ci
: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}

; https://github.com/weavejester/cljfmt
:cljfmt
Expand All @@ -57,19 +58,11 @@
"src" "test"
"--config" "cljkondo.edn"]}

:outdated
{:extra-deps {com.github.liquidz/antq {:mvn/version "RELEASE"}}
:main-opts ["-m" "antq.core"]}

:check
{:extra-deps {athos/clj-check {:git/url "https://github.com/athos/clj-check.git"
:sha "518d5a1cbfcd7c952f548e6dbfcb9a4a5faf9062"}}
:main-opts ["-m" "clj-check.check"]}

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

:test
{:extra-paths ["test"
"test/resources"]
Expand All @@ -79,10 +72,6 @@
:main-opts ["-m" "cognitect.test-runner"]
:exec-fn cognitect.test-runner.api/test}

:nrepl {:extra-paths ["test/resources"]
:extra-deps {nrepl/nrepl {:mvn/version "0.9.0"}}
:main-opts ["-m" "nrepl.cmdline"]}

:webly {:extra-paths ["test"]
:extra-deps {;org.slf4j/slf4j-nop {:mvn/version "1.7.32"}
org.pinkgorilla/webly {:mvn/version "0.4.623"
Expand Down Expand Up @@ -131,9 +120,6 @@
"--config" "[\"webly/config.edn\" ]"
]}




; tree and list are here just because tools.deps.alpha does not work on my machine
:tree {:extra-deps {org.clojure/tools.deps.alpha {:mvn/version "0.14.1178"}}
:exec-fn clojure.tools.cli.api/tree}
Expand Down
3 changes: 0 additions & 3 deletions release.edn

This file was deleted.

0 comments on commit 9ddbcfb

Please sign in to comment.