From d871bd311c6a3fc0c53d3c62f850c2ddcf0098ea Mon Sep 17 00:00:00 2001 From: Mohammad Mahdi Mohammadi Date: Sat, 4 Jan 2025 16:24:29 +0330 Subject: [PATCH] Now --- .gitea/workflows/gitea-ci.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.gitea/workflows/gitea-ci.yml b/.gitea/workflows/gitea-ci.yml index 3626ced..a096298 100755 --- a/.gitea/workflows/gitea-ci.yml +++ b/.gitea/workflows/gitea-ci.yml @@ -44,11 +44,7 @@ jobs: with: context: . push: true -<<<<<<< HEAD - tags: "git.mahdium.ir/mahdium/cats-of-mastodon-telegram-bot${{gitea.sha}},git.mahdium.ir/mahdium/cats-of-mastodon-telegram-bot:latest" -======= - tags: tags: "git.mahdium.ir/mahdium/cats-of-mastodon-telegram-bot${{gitea.sha}},git.mahdium.ir/mahdium/cats-of-mastodon-telegram-bot:latest" ->>>>>>> fdc5ee9728343b2a78ae9a0275c53824d9336f91 + tags: git.mahdium.ir/mahdium/cats-of-mastodon-telegram-bot${{gitea.sha}},git.mahdium.ir/mahdium/cats-of-mastodon-telegram-bot:latest labels: ${{ steps.meta.outputs.labels }} cache-from: type=registry,ref=user/app:latest cache-to: type=inline