From 1f05b8fe68631759bdb9e68733d477862d0c022a Mon Sep 17 00:00:00 2001
From: James <jwrober@gmail.com>
Date: Fri, 3 May 2024 17:28:29 -0500
Subject: [PATCH] Release: Ensure source archives get the freeciv21 directory

---
 .github/workflows/release.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 9024a592a8..f726bd4b2f 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -57,11 +57,13 @@ jobs:
         run: mkdir -p -v $PWD/build
       - name: Create tar.gz
         run: |
-          tar --exclude='build' --exclude='data/graphics' -cvzf Freeciv21-${{github.ref_name}}.tar.gz *
+          tar --exclude='build' --exclude='data/graphics' -cvzf Freeciv21-${{github.ref_name}}.tar.gz ../freeciv21/*
           sha256sum --binary Freeciv21-${{github.ref_name}}.tar.gz > Freeciv21-${{github.ref_name}}.tar.gz.sha256
       - name: Create zip
         run: |
-          zip -r Freeciv21-${{github.ref_name}}.zip * -x \/build/* \*.gz \*.sha256 \/data/graphics/*
+          cd ..
+          zip -r freeciv21/Freeciv21-${{github.ref_name}}.zip freeciv21/* -x \*/build/* \*.gz \*.sha256 \*/data/graphics/* \*/.*
+          cd freeciv21
           sha256sum --binary Freeciv21-${{github.ref_name}}.zip > Freeciv21-${{github.ref_name}}.zip.sha256
       - name: Upload package
         uses: softprops/action-gh-release@v2