From 9d280d207c7c6762c68f073ebfee619221b92b2d Mon Sep 17 00:00:00 2001 From: Michael Jerger Date: Fri, 22 Sep 2023 17:52:09 +0200 Subject: [PATCH 1/4] reenable release-to-forgejo --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a0203f5..e4279bc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -100,7 +100,7 @@ release-to-clojars: script: - pyb upload_clj -.release-to-forgejo: +release-to-forgejo: <<: *clj <<: *tag_only stage: upload From cd867061dee3f770e6e49a5dfdcbcda56d0ef49e Mon Sep 17 00:00:00 2001 From: Michael Jerger Date: Fri, 22 Sep 2023 17:53:18 +0200 Subject: [PATCH 2/4] use new images --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e4279bc..4690268 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ stages: - image .img: &img - image: "domaindrivenarchitecture/ddadevops-dind:4.7.0" + image: "domaindrivenarchitecture/ddadevops-dind:4.7.2" services: - docker:dind before_script: @@ -16,7 +16,7 @@ stages: - export IMAGE_TAG=$CI_COMMIT_TAG .cljs-job: &cljs - image: "domaindrivenarchitecture/ddadevops-clj-cljs:4.7.0" + image: "domaindrivenarchitecture/ddadevops-clj-cljs:4.7.2" cache: key: ${CI_COMMIT_REF_SLUG} paths: @@ -29,7 +29,7 @@ stages: - npm install .clj-job: &clj - image: "domaindrivenarchitecture/ddadevops-clj-cljs:4.7.0" + image: "domaindrivenarchitecture/ddadevops-clj-cljs:4.7.2" cache: key: ${CI_COMMIT_REF_SLUG} paths: From 576fdd9af788e36f487f81ace164c6b275b84a90 Mon Sep 17 00:00:00 2001 From: Michael Jerger Date: Fri, 22 Sep 2023 17:54:40 +0200 Subject: [PATCH 3/4] release: 1.4.2 --- infrastructure/app/build.py | 2 +- package.json | 2 +- project.clj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/infrastructure/app/build.py b/infrastructure/app/build.py index 19dd85a..d68cccd 100644 --- a/infrastructure/app/build.py +++ b/infrastructure/app/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = "c4k-jitsi" MODULE = "app" PROJECT_ROOT_PATH = "../.." -version = "1.4.2-SNAPSHOT" +version = "1.4.2" @init diff --git a/package.json b/package.json index b1d1c2c..97d1184 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.4.2-SNAPSHOT", + "version": "1.4.2", "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 0f27630..4e8b500 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-jitsi "1.4.2-SNAPSHOT" +(defproject org.domaindrivenarchitecture/c4k-jitsi "1.4.2" :description "jitsi c4k-installation package" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" From 097e0b45482c5206c87f9e9524c117098579e4eb Mon Sep 17 00:00:00 2001 From: Michael Jerger Date: Fri, 22 Sep 2023 17:54:40 +0200 Subject: [PATCH 4/4] bump version to: 1.4.3-SNAPSHOT --- infrastructure/app/build.py | 2 +- package.json | 2 +- project.clj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/infrastructure/app/build.py b/infrastructure/app/build.py index d68cccd..b8c6ea9 100644 --- a/infrastructure/app/build.py +++ b/infrastructure/app/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = "c4k-jitsi" MODULE = "app" PROJECT_ROOT_PATH = "../.." -version = "1.4.2" +version = "1.4.3-SNAPSHOT" @init diff --git a/package.json b/package.json index 97d1184..83205dd 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.4.2", + "version": "1.4.3-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 4e8b500..67e7e80 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-jitsi "1.4.2" +(defproject org.domaindrivenarchitecture/c4k-jitsi "1.4.3-SNAPSHOT" :description "jitsi c4k-installation package" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0"