From bc075a0a513c28acaeeec5d5923a4b85433f4a64 Mon Sep 17 00:00:00 2001
From: kjdev <kjclev@gmail.com>
Date: Wed, 20 May 2026 08:14:50 +0900
Subject: [PATCH] ci: wrap release archives in a top-level directory

---
 .github/workflows/package.yaml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml
index 5566fb4..48e099e 100644
--- a/.github/workflows/package.yaml
+++ b/.github/workflows/package.yaml
@@ -9,7 +9,7 @@ permissions: {}
 
 env:
   container: ${{ github.repository }}/nginx
-  archive: ${{ github.event.repository.name }}-${{ github.event.release.tag_name }}-full
+  archive: ${{ github.event.repository.name }}-${{ github.event.release.tag_name }}
 
 defaults:
   run:
@@ -105,18 +105,18 @@ jobs:
           token: ${{ github.token }}
       - name: Create archive (tar.gz)
         run: |
-          git archive --format=tar HEAD -o "${archive}.tar"
-          git submodule foreach --recursive 'git archive --format=tar --prefix="${displaypath}/" HEAD -o "${toplevel}/sub.tar" && tar -Af "${toplevel}/${archive}.tar" "${toplevel}/sub.tar" && rm "${toplevel}/sub.tar"'
-          gzip "${archive}.tar"
+          git archive --format=tar --prefix="${archive}/" HEAD -o "${archive}-full.tar"
+          git submodule foreach --recursive 'git archive --format=tar --prefix="${archive}/${displaypath}/" HEAD -o "${toplevel}/sub.tar" && tar -Af "${toplevel}/${archive}-full.tar" "${toplevel}/sub.tar" && rm "${toplevel}/sub.tar"'
+          gzip "${archive}-full.tar"
       - name: Create archive (zip)
         run: |
-          mkdir .extract && tar -xzf "${archive}.tar.gz" -C .extract
-          (cd .extract && zip -r ../"${archive}.zip" .)
+          mkdir .extract && tar -xzf "${archive}-full.tar.gz" -C .extract
+          (cd .extract && zip -r ../"${archive}-full.zip" .)
           rm -rf .extract
       - name: Upload Release Asset
         run: |
-          gh release upload "${VERSION}" "${archive}.tar.gz#Full Source code (tar.gz)" --clobber
-          gh release upload "${VERSION}" "${archive}.zip#Full Source code (zip)" --clobber
+          gh release upload "${VERSION}" "${archive}-full.tar.gz#Full Source code (tar.gz)" --clobber
+          gh release upload "${VERSION}" "${archive}-full.zip#Full Source code (zip)" --clobber
         env:
           GH_TOKEN: ${{ github.token }}
           VERSION: ${{ github.event.release.tag_name }}