From 345a156334ce6ff347b5d7044130932d49eff940 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 12 Mar 2023 22:36:27 +0600 Subject: [PATCH] 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