diff --git a/.gitignore b/.gitignore index 0217c33..c86df9d 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ public/js/ myauth.edn myconfig.edn +origconfig.edn diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6221b66..afc99c2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -92,11 +92,11 @@ sast: include: - template: Security/SAST.gitlab-ci.yml -upload-clj-prerelease: +upload-clj-release: <<: *clj stage: upload rules: - - if: '$CI_COMMIT_BRANCH == "master" && $CI_COMMIT_TAG == null' + - if: '$CI_COMMIT_TAG != null' script: - lein deploy clojars diff --git a/package.json b/package.json index 75929ca..1f4ce03 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "c4k-mastodon-bot", "description": "Generate c4k yaml for a mastodon-bot deployment.", "author": "meissa GmbH", - "version": "0.1.5-SNAPSHOT", + "version": "0.1.6", "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-mastodon-bot#readme", "repository": "https://www.npmjs.com/package/c4k-mastodon-bot", "license": "APACHE2", diff --git a/project.clj b/project.clj index c715cd5..5eb1118 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject dda/c4k-mastodon-bot "0.1.6-SNAPSHOT" +(defproject dda/c4k-mastodon-bot "0.1.6" :description "mastodon-bot c4k-installation package" :url "https://www.domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" @@ -16,8 +16,8 @@ :resource-paths ["src/main/resources"] :repositories [["snapshots" :clojars] ["releases" :clojars]] - :deploy-repositories [["snapshots" :clojars] - ["releases" :clojars]] + :deploy-repositories [["snapshots" {:sign-releases false :url "https://clojars.org/repo"}] + ["releases" {:sign-releases false :url "https://clojars.org/repo"}]] :profiles {:test {:test-paths ["src/test/cljc"] :resource-paths ["src/test/resources"] :dependencies [[dda/data-test "0.1.1"]]} @@ -29,11 +29,11 @@ [ch.qos.logback/logback-classic "1.3.0-alpha4" :exclusions [com.sun.mail/javax.mail]] [org.slf4j/jcl-over-slf4j "2.0.0-alpha1"]]}} - :release-tasks [["vcs" "assert-committed"] + :release-tasks [["test"] + ["vcs" "assert-committed"] ["change" "version" "leiningen.release/bump-version" "release"] ["vcs" "commit"] ["vcs" "tag"] - ["deploy"] ["change" "version" "leiningen.release/bump-version"]] :aliases {"native" ["shell" "native-image"