From f8b765dd991ad07c6456b286cf48ae393105ea2a Mon Sep 17 00:00:00 2001 From: austnv Date: Fri, 26 Jun 2026 13:13:37 +0300 Subject: [PATCH] fix build --- .gitea/workflows/build.yml | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 5692b7e..5b343d8 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -26,17 +26,20 @@ jobs: username: ${{ gitea.repository_owner }} password: ${{ secrets.ACCESS_TOKEN }} - - name: Set repository name to lowercase - id: repo + # Преобразуем имена в нижний регистр и собираем метаданные + - name: Prepare metadata + id: meta run: | OWNER=$(echo "${{ gitea.repository_owner }}" | tr '[:upper:]' '[:lower:]') REPO=$(echo "${{ github.event.repository.name }}" | tr '[:upper:]' '[:lower:]') + echo "owner=$OWNER" >> $GITHUB_OUTPUT echo "repo=$REPO" >> $GITHUB_OUTPUT - echo "full_repo=$OWNER/$REPO" >> $GITHUB_OUTPUT - - # Также сохраняем полный путь к образу echo "image=git.uvpn.shop/$OWNER/$REPO" >> $GITHUB_OUTPUT + echo "source=https://git.uvpn.shop/${{ gitea.repository }}" >> $GITHUB_OUTPUT + + # Формируем дату + echo "build_date=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT - name: Build and push Docker image uses: docker/build-push-action@v5 @@ -44,14 +47,15 @@ jobs: context: . push: true tags: | - ${{ steps.repo.outputs.image }}:latest - ${{ steps.repo.outputs.image }}:${{ gitea.ref_name }} + ${{ steps.meta.outputs.image }}:latest + ${{ steps.meta.outputs.image }}:${{ gitea.ref_name }} cache-from: type=gha cache-to: type=gha,mode=max build-args: | BUILD_VERSION=${{ gitea.ref_name }} - BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') + BUILD_DATE=${{ steps.meta.outputs.build_date }} VCS_REF=${{ github.sha }} + GITEA_REPOSITORY=${{ steps.meta.outputs.source }} - name: Create Gitea Release via API run: | @@ -62,7 +66,7 @@ jobs: { "tag_name": "${{ gitea.ref_name }}", "name": "Release ${{ gitea.ref_name }}", - "body": "## Релиз ${{ gitea.ref_name }}\n\n📝 ${TAG_MESSAGE_ESCAPED}\n\n---\n\n**🏷️ Тег:** \`${{ gitea.ref_name }}\`\n**👤 Автор:** @${{ gitea.actor }}\n**📦 Образ:** \`${{ steps.repo.outputs.image }}:${{ gitea.ref_name }}\`\n\n✅ Автоматически собрано и развёрнуто", + "body": "## Релиз ${{ gitea.ref_name }}\n\n📝 ${TAG_MESSAGE_ESCAPED}\n\n---\n\n**🏷️ Тег:** \`${{ gitea.ref_name }}\`\n**👤 Автор:** @${{ gitea.actor }}\n**📦 Образ:** \`${{ steps.meta.outputs.image }}:${{ gitea.ref_name }}\`\n\n✅ Автоматически собрано и развёрнуто", "draft": false, "prerelease": false } @@ -103,7 +107,7 @@ jobs: echo "${{ secrets.ACCESS_TOKEN }}" | docker login git.uvpn.shop -u ${{ gitea.repository_owner }} --password-stdin # Используем образ с правильным именем в нижнем регистре - export IMAGE_NAME="git.uvpn.shop/uvpn/backend" + export IMAGE_NAME="${{ steps.meta.outputs.image }}" docker compose pull docker compose down || true