From 40e4952711b9c1ac2f2afb5c7fd04b4f87a585dc Mon Sep 17 00:00:00 2001
From: paltovkone <paltovkone@gmail.com>
Date: Mon, 9 Mar 2026 22:32:27 +0400
Subject: [PATCH] feature test

---
 .gitea/workflows/build.yml | 23 ++++++++++++-----------
 v2ray/scripts/download.sh  |  4 ----
 v2ray/scripts/env.sh       | 12 ++++++------
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index fa787c4..27ee0fb 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -17,10 +17,10 @@ jobs:
       - name: Build packages
         shell: bash
         env:
-          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
-          GITEA_URL: ${{ vars.GITEA_URL }}
-          GITEA_OWNER: ${{ vars.GITEA_OWNER }}
-          GITEA_REPO: ${{ vars.GITEA_REPO }}
+          GITEA_TOKEN: ${{ secrets.G_TOKEN }}
+          GITEA_URL: ${{ vars.G_URL }}
+          GITEA_OWNER: ${{ vars.G_OWNER }}
+          GITEA_REPO: ${{ vars.G_REPO }}
         run: |
           INPUT="${{ github.event.inputs.packages }}"
 
@@ -48,17 +48,17 @@ jobs:
 
             WORK_DIR="$(pwd)/$PKG"
 
-            # Docker-out-of-Docker: volume mount не работает т.к. pwd — путь
-            # внутри runner-контейнера, недоступный хостовому Docker.
-            # Используем docker cp вместо -v.
             CID=$(docker create -w /pkg \
               -e PACKAGE="$PKG" \
               -e VERSION="$VERSION" \
-              -e GITEA_URL="$G_URL" \
-              -e GITEA_OWNER="$G_OWNER" \
-              -e GITEA_REPO="$G_REPO" \
-              -e GITEA_TOKEN="$G_TOKEN" \
+              -e GITEA_URL="$GITEA_URL" \
+              -e GITEA_OWNER="$GITEA_OWNER" \
+              -e GITEA_REPO="$GITEA_REPO" \
+              -e GITEA_TOKEN="$GITEA_TOKEN" \
               "$IMAGE" sleep infinity)
+
+            trap "echo '🧹 cleanup: $PKG'; docker rm -f '$CID' 2>/dev/null || true" EXIT
+
             docker start "$CID"
             docker cp "$WORK_DIR/." "$CID:/pkg/"
 
@@ -72,4 +72,5 @@ jobs:
             done
 
             docker rm -f "$CID"
+            trap - EXIT
           done
\ No newline at end of file
diff --git a/v2ray/scripts/download.sh b/v2ray/scripts/download.sh
index ea80c61..6d91581 100755
--- a/v2ray/scripts/download.sh
+++ b/v2ray/scripts/download.sh
@@ -1,11 +1,7 @@
 # # v2ray/scripts/download.sh
 # #!/bin/bash
 # VERSION=$1
-# 
 
-
-
-#!/usr/bin/env bash
 set -euo pipefail
 
 echo "download: $PACKAGE v$VERSION"
diff --git a/v2ray/scripts/env.sh b/v2ray/scripts/env.sh
index b049e4d..45277e5 100644
--- a/v2ray/scripts/env.sh
+++ b/v2ray/scripts/env.sh
@@ -3,11 +3,11 @@ set -euo pipefail
 apt-get update -qq
 apt-get install -y --no-install-recommends curl ca-certificates gnupg unzip wget
 
-# goreleaser repo → nfpm
-curl -fsSL https://repo.goreleaser.com/apt/gpg.key | gpg --dearmor -o /usr/share/keyrings/goreleaser.gpg
-echo "deb [signed-by=/usr/share/keyrings/goreleaser.gpg] https://repo.goreleaser.com/apt/ stable main" \
-  > /etc/apt/sources.list.d/goreleaser.list
+# Получаем последнюю версию автоматически
+NFPM_VERSION=$(curl -fsSL https://api.github.com/repos/goreleaser/nfpm/releases/latest \
+  | grep '"tag_name"' | sed 's/.*"v\([^"]*\)".*/\1/')
+
+curl -fsSL "https://github.com/goreleaser/nfpm/releases/download/v${NFPM_VERSION}/nfpm_${NFPM_VERSION}_Linux_x86_64.tar.gz" \
+  | tar -xz -C /usr/local/bin nfpm
 
-apt-get update -qq
-apt-get install -y nfpm
 echo "✓ nfpm $(nfpm --version)"
\ No newline at end of file