From 3fce8d4943d947a4a13dab344e5681fd9d01628d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= Date: Mon, 4 Sep 2023 11:10:46 +0200 Subject: [PATCH 1/8] Add CI file --- .woodpecker.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .woodpecker.yml diff --git a/.woodpecker.yml b/.woodpecker.yml new file mode 100644 index 0000000..ed97d53 --- /dev/null +++ b/.woodpecker.yml @@ -0,0 +1 @@ +--- -- 2.45.2 From aa478a5ed9078290387f35ad27ffe1ad71dcfbaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= Date: Mon, 4 Sep 2023 11:10:57 +0200 Subject: [PATCH 2/8] Update dependencies. --- .woodpecker.yml | 11 +++++++++++ build.gradle.kts | 16 ++++++++-------- gradle.properties | 4 ++-- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index ed97d53..f6b36e7 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1 +1,12 @@ --- +steps: + build: + image: gradle:jdk17 + commands: + - gradle --build-cache assemble + upload: + image: gradle:jdk17 + commands: + - gradle publish + when: + branch: master diff --git a/build.gradle.kts b/build.gradle.kts index 9b40272..5ca6ada 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ plugins { } group = "de.pheerai" -version = "0.0.12-SNAPSHOT" +version = "0.0.13-SNAPSHOT" repositories { mavenCentral() @@ -66,21 +66,21 @@ publishing { } fun MutableVersionConstraint.kotestConstraints() { - prefer("5.5.0") + prefer("5.7.1") strictly("[5.0.0,6.0.0[") } fun MutableVersionConstraint.kotlinxHtmlConstraints() { - prefer("0.8.0") - strictly("[0.8.0,0.9.0[") + prefer("0.9.1") + strictly("[0.9.0,1.0.0[") } fun MutableVersionConstraint.jsoupConstraints() { - prefer("1.15.4") - strictly("[1.15.0,1.16.0[") + prefer("1.16.1") + strictly("[1.16.0,1.17.0[") } fun MutableVersionConstraint.cliktConstraints() { - prefer("3.5.2") - strictly("[3.0.0,4.0.0[") + prefer("4.2.0") + strictly("[4.0.0,5.0.0[") } diff --git a/gradle.properties b/gradle.properties index 6ab1061..358af6d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ kotlin.code.style=official -coroutinesVersion=1.6.4 -kotlinVersion=1.8.20 +coroutinesVersion=1.7.1 +kotlinVersion=1.9.0 -- 2.45.2 From 11b6400ed47db0226b57202b48508b6da6966547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= Date: Mon, 4 Sep 2023 11:16:51 +0200 Subject: [PATCH 3/8] Configure secrets. --- .woodpecker.yml | 3 +++ build.gradle.kts | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index f6b36e7..f010734 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -10,3 +10,6 @@ steps: - gradle publish when: branch: master + secrets: + - source: maven-repo-token + target: ci_job_token diff --git a/build.gradle.kts b/build.gradle.kts index 5ca6ada..ef8bb9b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -52,10 +52,10 @@ publishing { } repositories { maven { - url = uri("https://git.f3l.de/api/v4/projects/160/packages/maven") - name = "GitLab" + name = "F3L Gitea" + url = uri("https://git.f3l.de/api/packages/pheerai/maven") credentials(HttpHeaderCredentials::class.java) { - name = "Job-Token" + name = "Authorization" value = System.getenv("CI_JOB_TOKEN") } authentication { -- 2.45.2 From 69d8a5f4ac41e8ec3c3f11e8ec39737901f7408e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= Date: Mon, 4 Sep 2023 11:21:58 +0200 Subject: [PATCH 4/8] Change repo name. --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index ef8bb9b..a20af5f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -52,7 +52,7 @@ publishing { } repositories { maven { - name = "F3L Gitea" + name = "gitea" url = uri("https://git.f3l.de/api/packages/pheerai/maven") credentials(HttpHeaderCredentials::class.java) { name = "Authorization" -- 2.45.2 From 3ee514ff7a421f4659cb777f76dbfa9dd3603699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= Date: Mon, 4 Sep 2023 11:28:47 +0200 Subject: [PATCH 5/8] Tiny changes to path. --- build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index a20af5f..25426a6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -52,8 +52,8 @@ publishing { } repositories { maven { - name = "gitea" - url = uri("https://git.f3l.de/api/packages/pheerai/maven") + name = "Gitea" + url = uri("https://git.f3l.de/api/packages/pheerai/maven/") credentials(HttpHeaderCredentials::class.java) { name = "Authorization" value = System.getenv("CI_JOB_TOKEN") -- 2.45.2 From 0a1a03bc402685cf4b59f3ea3c8336105b3bdf59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= Date: Mon, 4 Sep 2023 11:36:36 +0200 Subject: [PATCH 6/8] Restrict build triggers. --- .woodpecker.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index f010734..8f62ba3 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -8,8 +8,12 @@ steps: image: gradle:jdk17 commands: - gradle publish - when: - branch: master +# when: +# branch: +# - master secrets: - source: maven-repo-token target: ci_job_token +when: + event: + - push -- 2.45.2 From c5c4f3e9a39ab75eccdf74601c35cc4a21f43dd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= Date: Mon, 4 Sep 2023 11:45:06 +0200 Subject: [PATCH 7/8] Use BASIC instead of token. --- build.gradle.kts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 25426a6..3b3737f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -54,12 +54,9 @@ publishing { maven { name = "Gitea" url = uri("https://git.f3l.de/api/packages/pheerai/maven/") - credentials(HttpHeaderCredentials::class.java) { - name = "Authorization" - value = System.getenv("CI_JOB_TOKEN") - } - authentication { - create("header") + credentials { + username = "pheerai" + password = System.getenv("CI_JOB_TOKEN") } } } -- 2.45.2 From 69acc16cb123fa9b4aacdc5e057d97632c9b11d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= Date: Mon, 4 Sep 2023 12:07:33 +0200 Subject: [PATCH 8/8] Only push on master build - if it's working at all. --- .woodpecker.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 8f62ba3..9e6ef1b 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -8,9 +8,9 @@ steps: image: gradle:jdk17 commands: - gradle publish -# when: -# branch: -# - master + when: + branch: + - master secrets: - source: maven-repo-token target: ci_job_token -- 2.45.2