From 5d6524b9e3b766eccfd48fb4ac68b9a7f7ab5686 Mon Sep 17 00:00:00 2001 From: erik Date: Fri, 11 Aug 2023 14:47:13 +0200 Subject: [PATCH 1/5] [Skip-CI] Add release_artifacts --- build.py | 1 + 1 file changed, 1 insertion(+) diff --git a/build.py b/build.py index 7f1208b..6ea2727 100644 --- a/build.py +++ b/build.py @@ -18,6 +18,7 @@ def initialize(project): "stage": "notused", "project_root_path": PROJECT_ROOT_PATH, "build_types": [], + "release_artifacts": ["target/uberjar/c4k-jitsi-standalone.jar"], "mixin_types": ["RELEASE"], "release_primary_build_file": "project.clj", "release_secondary_build_files": [ From 61d05ceedb6dcbc6bb96b96fe6f03598e2878195 Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 27 Oct 2023 17:45:19 +0200 Subject: [PATCH 2/5] Use new inline-resources macro --- project.clj | 2 +- shadow-cljs.edn | 2 +- src/main/cljc/dda/c4k_jitsi/jitsi.cljc | 33 ++++++++++---------------- 3 files changed, 14 insertions(+), 23 deletions(-) diff --git a/project.clj b/project.clj index 7bfde58..bf8c494 100644 --- a/project.clj +++ b/project.clj @@ -5,7 +5,7 @@ :url "https://www.apache.org/licenses/LICENSE-2.0.html"} :dependencies [[org.clojure/clojure "1.11.1"] [org.clojure/tools.reader "1.3.6"] - [org.domaindrivenarchitecture/c4k-common-clj "6.0.3"] + [org.domaindrivenarchitecture/c4k-common-clj "6.1.0"] [hickory "0.7.1" :exclusions [viebel/codox-klipse-theme]]] :target-path "target/%s/" :source-paths ["src/main/cljc" diff --git a/shadow-cljs.edn b/shadow-cljs.edn index 1c7058c..02a193d 100644 --- a/shadow-cljs.edn +++ b/shadow-cljs.edn @@ -4,7 +4,7 @@ "src/test/cljc" "src/test/cljs" "src/test/resources"] - :dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "6.0.3"] + :dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "6.1.0"] [hickory "0.7.1"]] :builds {:frontend {:target :browser :modules {:main {:init-fn dda.c4k-jitsi.browser/init}} diff --git a/src/main/cljc/dda/c4k_jitsi/jitsi.cljc b/src/main/cljc/dda/c4k_jitsi/jitsi.cljc index f7112a5..956da0e 100644 --- a/src/main/cljc/dda/c4k_jitsi/jitsi.cljc +++ b/src/main/cljc/dda/c4k_jitsi/jitsi.cljc @@ -1,14 +1,14 @@ (ns dda.c4k-jitsi.jitsi - (:require - [clojure.spec.alpha :as s] - #?(:cljs [shadow.resource :as rc]) - #?(:clj [orchestra.core :refer [defn-spec]] - :cljs [orchestra.core :refer-macros [defn-spec]]) - [dda.c4k-common.yaml :as yaml] - [dda.c4k-common.common :as cm] - [dda.c4k-common.ingress :as ing] - [dda.c4k-common.base64 :as b64] - [dda.c4k-common.predicate :as cp])) + (:require + [clojure.spec.alpha :as s] + #?(:clj [orchestra.core :refer [defn-spec]] + :cljs [orchestra.core :refer-macros [defn-spec]]) + [dda.c4k-common.yaml :as yaml] + [dda.c4k-common.common :as cm] + [dda.c4k-common.ingress :as ing] + [dda.c4k-common.base64 :as b64] + [dda.c4k-common.predicate :as cp] + #?(:cljs [dda.c4k-common.macros :refer-macros [inline-resources]]))) (s/def ::fqdn cp/fqdn-string?) (s/def ::issuer cp/letsencrypt-issuer?) @@ -22,18 +22,9 @@ (def auth? (s/keys :req-un [::jvb-auth-password ::jicofo-auth-password ::jicofo-component-secret])) - -#?(:cljs +#?(:cljs (defmethod yaml/load-resource :jitsi [resource-name] - (case resource-name - "jitsi/deployment.yaml" (rc/inline "jitsi/deployment.yaml") - "jitsi/etherpad-service.yaml" (rc/inline "jitsi/etherpad-service.yaml") - "jitsi/jvb-service.yaml" (rc/inline "jitsi/jvb-service.yaml") - "jitsi/excalidraw-backend-service.yaml" (rc/inline "jitsi/excalidraw-backend-service.yaml") - "jitsi/excalidraw-deployment.yaml" (rc/inline "jitsi/excalidraw-deployment.yaml") - "jitsi/secret.yaml" (rc/inline "jitsi/secret.yaml") - "jitsi/web-service.yaml" (rc/inline "jitsi/web-service.yaml") - (throw (js/Error. "Undefined Resource!"))))) + (get (inline-resources "jitsi") resource-name))) (defn-spec generate-ingress-web cp/map-or-seq? [config config?] From d3f5d10b3ff0dfd466e1a766b1c6784825263986 Mon Sep 17 00:00:00 2001 From: Michael Jerger Date: Fri, 3 Nov 2023 11:07:09 +0100 Subject: [PATCH 3/5] fail on install error --- infrastructure/web/image/resources/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure/web/image/resources/install.sh b/infrastructure/web/image/resources/install.sh index 1f55e4c..ce36a25 100755 --- a/infrastructure/web/image/resources/install.sh +++ b/infrastructure/web/image/resources/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -Eeo pipefail +set -eux apt-get update > /dev/null apt-get upgrade -y > /dev/null From ee4ae4035dea53031e31ba78d010e427a7f49553 Mon Sep 17 00:00:00 2001 From: Clemens Date: Fri, 10 Nov 2023 13:17:07 +0100 Subject: [PATCH 4/5] release: 1.6.0 --- infrastructure/excalidraw-backend/build.py | 2 +- infrastructure/web/build.py | 2 +- package.json | 2 +- project.clj | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/infrastructure/excalidraw-backend/build.py b/infrastructure/excalidraw-backend/build.py index cd6831f..e8300e3 100644 --- a/infrastructure/excalidraw-backend/build.py +++ b/infrastructure/excalidraw-backend/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = "c4k-jitsi" MODULE = "excalidraw-backend" PROJECT_ROOT_PATH = "../.." -version = "1.5.2-SNAPSHOT" +version = "1.6.0" @init diff --git a/infrastructure/web/build.py b/infrastructure/web/build.py index c41f2e5..c9c1d9c 100644 --- a/infrastructure/web/build.py +++ b/infrastructure/web/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = "c4k-jitsi" MODULE = "web" PROJECT_ROOT_PATH = "../.." -version = "1.5.2-SNAPSHOT" +version = "1.6.0" @init diff --git a/package.json b/package.json index 021c3ce..9d1e31a 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "c4k-jitsi", "description": "Generate c4k yaml for a jitsi deployment.", "author": "meissa GmbH", - "version": "1.5.2-SNAPSHOT", + "version": "1.6.0", "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-jitsi#readme", "repository": "https://www.npmjs.com/package/c4k-jitsi", "license": "APACHE2", diff --git a/project.clj b/project.clj index bf8c494..ee91a14 100644 --- a/project.clj +++ b/project.clj @@ -1,10 +1,10 @@ -(defproject org.domaindrivenarchitecture/c4k-jitsi "1.5.2-SNAPSHOT" +(defproject org.domaindrivenarchitecture/c4k-jitsi "1.6.0" :description "jitsi c4k-installation package" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" :url "https://www.apache.org/licenses/LICENSE-2.0.html"} :dependencies [[org.clojure/clojure "1.11.1"] - [org.clojure/tools.reader "1.3.6"] + [org.clojure/tools.reader "1.3.7"] [org.domaindrivenarchitecture/c4k-common-clj "6.1.0"] [hickory "0.7.1" :exclusions [viebel/codox-klipse-theme]]] :target-path "target/%s/" From 89de4ed0a5b1247d387b28aebbbd357599264480 Mon Sep 17 00:00:00 2001 From: Clemens Date: Fri, 10 Nov 2023 13:17:07 +0100 Subject: [PATCH 5/5] bump version to: 1.6.1-SNAPSHOT --- infrastructure/excalidraw-backend/build.py | 2 +- infrastructure/web/build.py | 2 +- package.json | 2 +- project.clj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/infrastructure/excalidraw-backend/build.py b/infrastructure/excalidraw-backend/build.py index e8300e3..58a9f51 100644 --- a/infrastructure/excalidraw-backend/build.py +++ b/infrastructure/excalidraw-backend/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = "c4k-jitsi" MODULE = "excalidraw-backend" PROJECT_ROOT_PATH = "../.." -version = "1.6.0" +version = "1.6.1-SNAPSHOT" @init diff --git a/infrastructure/web/build.py b/infrastructure/web/build.py index c9c1d9c..6997d98 100644 --- a/infrastructure/web/build.py +++ b/infrastructure/web/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = "c4k-jitsi" MODULE = "web" PROJECT_ROOT_PATH = "../.." -version = "1.6.0" +version = "1.6.1-SNAPSHOT" @init diff --git a/package.json b/package.json index 9d1e31a..12bd244 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "c4k-jitsi", "description": "Generate c4k yaml for a jitsi deployment.", "author": "meissa GmbH", - "version": "1.6.0", + "version": "1.6.1-SNAPSHOT", "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-jitsi#readme", "repository": "https://www.npmjs.com/package/c4k-jitsi", "license": "APACHE2", diff --git a/project.clj b/project.clj index ee91a14..8b325a1 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-jitsi "1.6.0" +(defproject org.domaindrivenarchitecture/c4k-jitsi "1.6.1-SNAPSHOT" :description "jitsi c4k-installation package" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0"