From 2607f759c679ba08d3ed76a1ef6e478e50169093 Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 25 Feb 2022 10:41:30 +0100 Subject: [PATCH 1/6] update project setup to fit convention --- .gitlab-ci.yml | 8 -------- project.clj | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1d6044b..e4ae2a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -96,14 +96,6 @@ package-uberjar: paths: - target/uberjar -upload-clj-prerelease: - <<: *clj - stage: upload - rules: - - if: '$CI_COMMIT_BRANCH == "master" && $CI_COMMIT_TAG == null' - script: - - lein deploy clojars - release: image: registry.gitlab.com/gitlab-org/release-cli:latest stage: upload diff --git a/project.clj b/project.clj index aaf8435..c7c49bd 100644 --- a/project.clj +++ b/project.clj @@ -12,8 +12,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"]]} From a49b07e7defd9aeeeb1cf2e040e0e680d52025b2 Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 25 Feb 2022 10:42:45 +0100 Subject: [PATCH 2/6] v2.0.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fd2cde0..ee62b6e 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "c4k-nextcloud", "description": "Generate c4k yaml for a nextcloud deployment.", "author": "meissa GmbH", - "version": "2.0.1-SNAPSHOT", + "version": "2.0.1", "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-nextcloud#readme", "repository": "https://www.npmjs.com/package/c4k-nextcloud", "license": "APACHE2", From 7e9bd75cde7b79197f394e9f82c9f6d9af4a59ac Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 25 Feb 2022 10:42:55 +0100 Subject: [PATCH 3/6] Version 1.0.3 --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index c7c49bd..98a81b0 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-nextcloud "1.0.3-SNAPSHOT" +(defproject org.domaindrivenarchitecture/c4k-nextcloud "1.0.3" :description "nextcloud c4k-installation package" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" From 4836f7a97754040d7371ded3c54f7c93a1d2d78d Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 25 Feb 2022 10:43:28 +0100 Subject: [PATCH 4/6] version bump --- package.json | 2 +- project.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ee62b6e..d2bfa35 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "c4k-nextcloud", "description": "Generate c4k yaml for a nextcloud deployment.", "author": "meissa GmbH", - "version": "2.0.1", + "version": "2.0.2-SNAPSHOT", "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-nextcloud#readme", "repository": "https://www.npmjs.com/package/c4k-nextcloud", "license": "APACHE2", diff --git a/project.clj b/project.clj index 98a81b0..143dde4 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-nextcloud "1.0.3" +(defproject org.domaindrivenarchitecture/c4k-nextcloud "1.0.4-SNAPSHOT" :description "nextcloud c4k-installation package" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" From 471e920f604f9822259cd82acf18927b405ebcce Mon Sep 17 00:00:00 2001 From: Clemens Geibel Date: Fri, 25 Feb 2022 11:50:40 +0100 Subject: [PATCH 5/6] Version 3.0.0 --- .gitlab-ci.yml | 8 ++++++++ package.json | 2 +- project.clj | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e4ae2a9..91411e6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -96,6 +96,14 @@ package-uberjar: paths: - target/uberjar +upload-clj-release: + <<: *clj + stage: upload + rules: + - if: '$CI_COMMIT_TAG != null' + script: + - lein deploy + release: image: registry.gitlab.com/gitlab-org/release-cli:latest stage: upload diff --git a/package.json b/package.json index d2bfa35..4052f8a 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "c4k-nextcloud", "description": "Generate c4k yaml for a nextcloud deployment.", "author": "meissa GmbH", - "version": "2.0.2-SNAPSHOT", + "version": "3.0.0", "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-nextcloud#readme", "repository": "https://www.npmjs.com/package/c4k-nextcloud", "license": "APACHE2", diff --git a/project.clj b/project.clj index 143dde4..10f2b2e 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-nextcloud "1.0.4-SNAPSHOT" +(defproject org.domaindrivenarchitecture/c4k-nextcloud "3.0.0" :description "nextcloud c4k-installation package" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" From f45105ba683dc569cc782ea1c7f9b8bcde9cc276 Mon Sep 17 00:00:00 2001 From: Clemens Geibel Date: Fri, 25 Feb 2022 11:51:12 +0100 Subject: [PATCH 6/6] version bump --- package.json | 2 +- project.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 4052f8a..0a44afb 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "c4k-nextcloud", "description": "Generate c4k yaml for a nextcloud deployment.", "author": "meissa GmbH", - "version": "3.0.0", + "version": "3.0.0-SNAPSHOT", "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-nextcloud#readme", "repository": "https://www.npmjs.com/package/c4k-nextcloud", "license": "APACHE2", diff --git a/project.clj b/project.clj index 10f2b2e..95f41df 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-nextcloud "3.0.0" +(defproject org.domaindrivenarchitecture/c4k-nextcloud "3.0.1-SNAPSHOT" :description "nextcloud c4k-installation package" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0"