From bc8d0b26bd3c0c3be4f30bf28e530ccbd62a6f8d Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 28 Feb 2023 14:23:35 +0600 Subject: [PATCH 01/10] start 0.1.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 426d004..5c07492 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,4 +10,4 @@ android.enableJetifier=true # Project data group=dev.inmo -version=0.0.10 +version=0.1.0 From 86183f5f74b88fcd4b156cacbc37751b4463e496 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 28 Feb 2023 14:25:45 +0600 Subject: [PATCH 02/10] Update libs.versions.toml --- gradle/libs.versions.toml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 96122e2..41e2174 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,15 +1,15 @@ [versions] -kotlin = "1.7.22" -kotlin-serialization = "1.4.1" +kotlin = "1.8.10" +kotlin-serialization = "1.5.0" -plagubot = "3.5.0" -tgbotapi = "5.2.1" -microutils = "0.16.11" -kslog = "0.5.4" -krontab = "0.8.5" -tgbotapi-libraries = "0.8.2" -plagubot-plugins = "0.8.1" +plagubot = "4.0.0" +tgbotapi = "6.0.0" +microutils = "0.17.0" +kslog = "1.0.0" +krontab = "0.9.0" +tgbotapi-libraries = "0.9.0" +plagubot-plugins = "0.9.0" dokka = "1.7.20" From fea25743d58796f64498cc7ab12c3c89a2631a41 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 5 Mar 2023 00:55:00 +0600 Subject: [PATCH 03/10] Update libs.versions.toml --- gradle/libs.versions.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 41e2174..26dae55 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,15 +3,15 @@ kotlin = "1.8.10" kotlin-serialization = "1.5.0" -plagubot = "4.0.0" -tgbotapi = "6.0.0" -microutils = "0.17.0" +plagubot = "4.0.3" +tgbotapi = "6.0.3" +microutils = "0.17.2" kslog = "1.0.0" krontab = "0.9.0" -tgbotapi-libraries = "0.9.0" -plagubot-plugins = "0.9.0" +tgbotapi-libraries = "0.9.3" +plagubot-plugins = "0.9.3" -dokka = "1.7.20" +dokka = "1.8.10" psql = "42.5.0" From f09e80b8bd0e53786c5c3ab16810ba5fc06e27b9 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 5 Mar 2023 23:30:22 +0600 Subject: [PATCH 04/10] fixes for building --- common/src/commonMain/kotlin/DateTimeSerializer.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/common/src/commonMain/kotlin/DateTimeSerializer.kt b/common/src/commonMain/kotlin/DateTimeSerializer.kt index 13c701e..a4a3ec4 100644 --- a/common/src/commonMain/kotlin/DateTimeSerializer.kt +++ b/common/src/commonMain/kotlin/DateTimeSerializer.kt @@ -8,7 +8,6 @@ import kotlinx.serialization.descriptors.SerialDescriptor import kotlinx.serialization.encoding.Decoder import kotlinx.serialization.encoding.Encoder -@Serializer(DateTime::class) object DateTimeSerializer : KSerializer { override val descriptor: SerialDescriptor = Double.serializer().descriptor override fun deserialize(decoder: Decoder): DateTime = DateTime(decoder.decodeDouble()) From 3b858a3c0078c2f924eca6bfabea209c09885760 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 9 Mar 2023 12:00:57 +0600 Subject: [PATCH 05/10] Update libs.versions.toml --- gradle/libs.versions.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 26dae55..35766be 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,13 +3,13 @@ kotlin = "1.8.10" kotlin-serialization = "1.5.0" -plagubot = "4.0.3" -tgbotapi = "6.0.3" -microutils = "0.17.2" +plagubot = "4.1.0" +tgbotapi = "6.1.0" +microutils = "0.17.3" kslog = "1.0.0" krontab = "0.9.0" -tgbotapi-libraries = "0.9.3" -plagubot-plugins = "0.9.3" +tgbotapi-libraries = "0.9.4" +plagubot-plugins = "0.9.4" dokka = "1.8.10" From 7fb7f923f79fcedd6fa5dfc2674cb328f7eeccec Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 12 Mar 2023 17:37:52 +0600 Subject: [PATCH 06/10] Update libs.versions.toml --- gradle/libs.versions.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 35766be..9d06886 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,13 +3,13 @@ kotlin = "1.8.10" kotlin-serialization = "1.5.0" -plagubot = "4.1.0" -tgbotapi = "6.1.0" -microutils = "0.17.3" +plagubot = "5.0.0" +tgbotapi = "7.0.0" +microutils = "0.17.5" kslog = "1.0.0" krontab = "0.9.0" -tgbotapi-libraries = "0.9.4" -plagubot-plugins = "0.9.4" +tgbotapi-libraries = "0.10.0" +plagubot-plugins = "0.10.0" dokka = "1.8.10" From 345a156334ce6ff347b5d7044130932d49eff940 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 12 Mar 2023 22:36:27 +0600 Subject: [PATCH 07/10] fixes --- .github/workflows/docker-publish.yml | 13 +++++++++---- posts_registrar/src/jvmMain/kotlin/Plugin.kt | 1 - 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index fc12e4c..1d847e2 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -1,8 +1,7 @@ name: Docker -on: - push: - branches: - - master + +on: [push] + jobs: publishing: runs-on: ubuntu-latest @@ -12,6 +11,12 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v2 + - name: Rewrite version + run: | + branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`" + cat gradle.properties | sed -e "s/^version=\([0-9\.]*\)/version=\1-branch_$branch-build${{ github.run_number }}/" > gradle.properties.tmp + rm gradle.properties + mv gradle.properties.tmp gradle.properties - name: Log into registry uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c with: diff --git a/posts_registrar/src/jvmMain/kotlin/Plugin.kt b/posts_registrar/src/jvmMain/kotlin/Plugin.kt index 028e185..ecdf6d7 100644 --- a/posts_registrar/src/jvmMain/kotlin/Plugin.kt +++ b/posts_registrar/src/jvmMain/kotlin/Plugin.kt @@ -21,7 +21,6 @@ import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.* import dev.inmo.tgbotapi.extensions.utils.extensions.raw.text import dev.inmo.tgbotapi.extensions.utils.extensions.sameChat import dev.inmo.tgbotapi.extensions.utils.extensions.sameMessage -import dev.inmo.tgbotapi.extensions.utils.formatting.buildEntities import dev.inmo.tgbotapi.extensions.utils.textContentOrNull import dev.inmo.tgbotapi.extensions.utils.types.buttons.* import dev.inmo.tgbotapi.types.message.abstracts.ContentMessage From 8a648cb0665dd215a11066ed2ae1067e6df7a43d Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 12 Mar 2023 22:40:43 +0600 Subject: [PATCH 08/10] fixes in docker publishing script --- .github/workflows/docker-publish.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 1d847e2..83a91c3 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -14,9 +14,11 @@ jobs: - name: Rewrite version run: | branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`" - cat gradle.properties | sed -e "s/^version=\([0-9\.]*\)/version=\1-branch_$branch-build${{ github.run_number }}/" > gradle.properties.tmp - rm gradle.properties - mv gradle.properties.tmp gradle.properties + if [[ "$branch" != "master" ]]; then + cat gradle.properties | sed -e "s/^version=\([0-9\.]*\)/version=\1-branch_$branch-build${{ github.run_number }}/" > gradle.properties.tmp + rm gradle.properties + mv gradle.properties.tmp gradle.properties + fi - name: Log into registry uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c with: From c6bcfc00680e5f1c745ca56704de9b95ef684460 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 12 Mar 2023 22:49:34 +0600 Subject: [PATCH 09/10] upgrade version retieving from gradle.properties --- runner/deploy.sh | 2 +- runner/nonsudo_deploy.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runner/deploy.sh b/runner/deploy.sh index c99bb32..0c68c50 100755 --- a/runner/deploy.sh +++ b/runner/deploy.sh @@ -14,7 +14,7 @@ function assert_success() { } app=plaguposter -version="`grep ../gradle.properties -e "^version=" | grep -e "[0-9.]*" -o`" +version="`grep ../gradle.properties -e "^version=" | sed -e "s/version=\(.*\)/\1/"`" server=docker.io/insanusmokrassar assert_success ../gradlew build diff --git a/runner/nonsudo_deploy.sh b/runner/nonsudo_deploy.sh index e97a37a..472afd0 100755 --- a/runner/nonsudo_deploy.sh +++ b/runner/nonsudo_deploy.sh @@ -14,7 +14,7 @@ function assert_success() { } app=plaguposter -version="`grep ../gradle.properties -e "^version=" | grep -e "[0-9.]*" -o`" +version="`grep ../gradle.properties -e "^version=" | sed -e "s/version=\(.*\)/\1/"`" server=insanusmokrassar assert_success ../gradlew build From 22c94a4c43c1271b542cc4ff153e937a66bbbc4b Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 12 Mar 2023 22:56:20 +0600 Subject: [PATCH 10/10] update base image --- runner/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runner/Dockerfile b/runner/Dockerfile index 04ac022..13a7085 100644 --- a/runner/Dockerfile +++ b/runner/Dockerfile @@ -1,4 +1,4 @@ -FROM adoptopenjdk/openjdk11 +FROM bellsoft/liberica-openjdk-alpine:19 USER 1000