diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7312940..027d9a1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,7 +38,7 @@ test-cljs: script: - shadow-cljs compile test -upload-clj-prerelease: +.upload-clj-prerelease: <<: *clj stage: upload rules: @@ -46,7 +46,7 @@ upload-clj-prerelease: script: - lein deploy clojars -upload-cljs-prerelease: +.upload-cljs-prerelease: <<: *clj stage: upload rules: @@ -54,3 +54,21 @@ upload-cljs-prerelease: script: - mv project.clj project-clj.clj && mv project-cljs.clj project.clj - lein deploy clojars + +upload-clj-release: + <<: *clj + stage: upload + rules: + - if: '$CI_COMMIT_BRANCH == "master" && $CI_COMMIT_TAG != null' + script: + - lein deploy clojars + +upload-cljs-release: + <<: *clj + stage: upload + rules: + - if: '$CI_COMMIT_BRANCH == "master" && $CI_COMMIT_TAG != null' + script: + - mv project.clj project-clj.clj && mv project-cljs.clj project.clj + - lein deploy clojars + diff --git a/doc/Releasing.md b/doc/Releasing.md new file mode 100644 index 0000000..2118d77 --- /dev/null +++ b/doc/Releasing.md @@ -0,0 +1,17 @@ +# stable release (should be done from master) + +``` +#adjust [version] +vi project.clj +vi project-cljs.clj + +git commit -am "release" +git tag -am "release" [release version no] +git push --follow-tags + +# bump version - increase version and add -SNAPSHOT +vi project.clj +vi project-cljs.clj +git commit -am "version bump" +git push +``` \ No newline at end of file diff --git a/project-cljs.clj b/project-cljs.clj index c85ac7b..02cc7b9 100644 --- a/project-cljs.clj +++ b/project-cljs.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-common-cljs "0.2.0-SNAPSHOT" +(defproject org.domaindrivenarchitecture/c4k-common-cljs "0.2.2-SNAPSHOT" :description "Contains predicates and tools for c4k" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" @@ -13,7 +13,8 @@ :repositories [["snapshots" :clojars] ["releases" :clojars]] :deploy-repositories [["snapshots" :clojars] - ["releases" :clojars]] + ["releases" {:url "https://clojars.org/repo" + :sign-releases false}]] :release-tasks [["vcs" "assert-committed"] ["change" "version" "leiningen.release/bump-version" "release"] ["vcs" "commit"] diff --git a/project.clj b/project.clj index 998ee24..38695aa 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-common-clj "0.2.1" +(defproject org.domaindrivenarchitecture/c4k-common-clj "0.2.2-SNAPSHOT" :description "Contains predicates and tools for c4k" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" @@ -13,8 +13,7 @@ "src/main/clj"] :resource-paths ["src/main/resources"] :repositories [["snapshots" :clojars] - ["releases" {:url "https://clojars.org/repo" - :sign-releases false}]] + ["releases" :clojars]] :deploy-repositories [["snapshots" :clojars] ["releases" {:url "https://clojars.org/repo" :sign-releases false}]]