From cb7257ed6f9d64cbb1e2fb427cb0eea1e4d7d6c7 Mon Sep 17 00:00:00 2001
From: lawrence <l@millard.ink>
Date: Tue, 24 Feb 2026 10:33:21 +0000
Subject: [PATCH] Update .gitea/workflows/release.yml

---
 .gitea/workflows/release.yml | 138 ++++++++++++++++++-----------------
 1 file changed, 72 insertions(+), 66 deletions(-)

diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml
index ebe563b..4ea82a7 100644
--- a/.gitea/workflows/release.yml
+++ b/.gitea/workflows/release.yml
@@ -7,9 +7,18 @@ on:
     tags:
       - 'v*'
 
+permissions:
+  contents: write
+  packages: write
+
 jobs:
   release:
     runs-on: ubuntu-latest
+
+    env:
+      OWNER: ${{ github.repository_owner }}
+      REPO: ${{ github.event.repository.name }}
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -49,16 +58,17 @@ jobs:
         run: |
           cargo deb -p relay --no-build
           cargo deb -p client --no-build
-          mkdir -p dist
-          cp target/debian/*.deb dist/
+          cp target/debian/*.deb dist/ || true
 
       - name: Build rpm packages
         run: |
           cargo rpm build -p relay --release
           cargo rpm build -p client --release
-          mkdir -p dist
           find target/release/rpmbuild/RPMS -name "*.rpm" -exec cp {} dist/ \;
 
+      # -------------------------------------------------
+      # FIXED: Generic package upload (Gitea correct API)
+      # -------------------------------------------------
       - name: Publish generic packages
         env:
           TOKEN: ${{ secrets.TOKEN }}
@@ -67,17 +77,21 @@ jobs:
             echo "TOKEN missing; skipping generic packages"
             exit 0
           fi
-          OWNER="${GITHUB_REPOSITORY%/*}"
-          REPO="${GITHUB_REPOSITORY#*/}"
+
           VERSION="${{ steps.version.outputs.version }}"
+
           for file in dist/*; do
             name=$(basename "$file")
             curl -sSf -X PUT \
               -H "Authorization: token ${TOKEN}" \
-              --upload-file "$file" \
+              -H "Content-Type: application/octet-stream" \
+              --data-binary @"$file" \
               "${GITHUB_SERVER_URL}/api/packages/${OWNER}/generic/${REPO}/${VERSION}/${name}"
           done
 
+      # -------------------------------------------------
+      # OCI Images (fixed repo casing issue)
+      # -------------------------------------------------
       - name: Build and push OCI images
         env:
           TOKEN: ${{ secrets.TOKEN }}
@@ -87,65 +101,74 @@ jobs:
             echo "TOKEN or USERNAME missing; skipping OCI"
             exit 0
           fi
+
           VERSION="${{ steps.version.outputs.version }}"
+          IMAGE_BASE="git.dvv.one/${OWNER}/${REPO}"
+
           echo "${TOKEN}" | docker login git.dvv.one -u "${USERNAME}" --password-stdin
 
-          printf '%s\n' \
-            'FROM debian:bookworm-slim' \
-            'COPY target/release/relay /usr/local/bin/relay' \
-            'EXPOSE 7000 7001 25565' \
-            'ENTRYPOINT ["/usr/local/bin/relay"]' \
-            > Dockerfile.relay
+          cat > Dockerfile.relay <<EOF
+FROM debian:bookworm-slim
+COPY target/release/relay /usr/local/bin/relay
+EXPOSE 7000 7001 25565
+ENTRYPOINT ["/usr/local/bin/relay"]
+EOF
 
-          printf '%s\n' \
-            'FROM debian:bookworm-slim' \
-            'COPY target/release/client /usr/local/bin/client' \
-            'ENTRYPOINT ["/usr/local/bin/client"]' \
-            > Dockerfile.client
+          cat > Dockerfile.client <<EOF
+FROM debian:bookworm-slim
+COPY target/release/client /usr/local/bin/client
+ENTRYPOINT ["/usr/local/bin/client"]
+EOF
 
-          docker build -f Dockerfile.relay -t git.dvv.one/${GITHUB_REPOSITORY,,}/relay:${VERSION} .
-          docker build -f Dockerfile.client -t git.dvv.one/${GITHUB_REPOSITORY,,}/client:${VERSION} .
+          docker build -f Dockerfile.relay -t ${IMAGE_BASE}/relay:${VERSION} .
+          docker build -f Dockerfile.client -t ${IMAGE_BASE}/client:${VERSION} .
 
           if [[ "${GITHUB_REF}" == "refs/heads/main" ]]; then
-            docker tag git.dvv.one/${GITHUB_REPOSITORY,,}/relay:${VERSION} git.dvv.one/${GITHUB_REPOSITORY,,}/relay:main
-            docker tag git.dvv.one/${GITHUB_REPOSITORY,,}/client:${VERSION} git.dvv.one/${GITHUB_REPOSITORY,,}/client:main
+            docker tag ${IMAGE_BASE}/relay:${VERSION} ${IMAGE_BASE}/relay:main
+            docker tag ${IMAGE_BASE}/client:${VERSION} ${IMAGE_BASE}/client:main
           fi
 
-          docker push git.dvv.one/${GITHUB_REPOSITORY,,}/relay:${VERSION}
-          docker push git.dvv.one/${GITHUB_REPOSITORY,,}/client:${VERSION}
+          docker push ${IMAGE_BASE}/relay:${VERSION}
+          docker push ${IMAGE_BASE}/client:${VERSION}
+
           if [[ "${GITHUB_REF}" == "refs/heads/main" ]]; then
-            docker push git.dvv.one/${GITHUB_REPOSITORY,,}/relay:main
-            docker push git.dvv.one/${GITHUB_REPOSITORY,,}/client:main
+            docker push ${IMAGE_BASE}/relay:main
+            docker push ${IMAGE_BASE}/client:main
           fi
 
+      # -------------------------------------------------
+      # FIXED: Proper Gitea Cargo registry setup
+      # -------------------------------------------------
+      - name: Configure Cargo for Gitea
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
+          mkdir -p ~/.cargo
+          cat > ~/.cargo/config.toml <<EOF
+[registries.gitea]
+index = "sparse+${GITHUB_SERVER_URL}/api/packages/${OWNER}/cargo/"
+EOF
+
       - name: Publish Cargo packages
+        if: startsWith(github.ref, 'refs/tags/')
         env:
-          TOKEN: ${{ secrets.TOKEN }}
-          CARGO_REGISTRIES_GITEA_INDEX: sparse+https://git.dvv.one/api/packages/${{ github.repository_owner }}/cargo/
           CARGO_REGISTRIES_GITEA_TOKEN: ${{ secrets.TOKEN }}
         run: |
-          if [[ "${GITHUB_REF}" != refs/tags/* ]]; then
-            echo "Not a tag; skipping cargo publish"
-            exit 0
-          fi
-          if [[ -z "${TOKEN}" ]]; then
-            echo "TOKEN missing; skipping cargo publish"
-            exit 0
-          fi
           TAG="${GITHUB_REF#refs/tags/}"
-          RELAY_VER=$(cargo metadata --format-version 1 | python -c 'import json,sys;meta=json.load(sys.stdin);print([p["version"] for p in meta["packages"] if p["name"]=="relay"][0])')
-          CLIENT_VER=$(cargo metadata --format-version 1 | python -c 'import json,sys;meta=json.load(sys.stdin);print([p["version"] for p in meta["packages"] if p["name"]=="client"][0])')
-          if [[ "v${RELAY_VER}" != "${TAG}" ]]; then
-            echo "Tag ${TAG} does not match relay version v${RELAY_VER}; skipping relay publish"
-          else
+
+          RELAY_VER=$(cargo metadata --format-version 1 | jq -r '.packages[] | select(.name=="relay") | .version')
+          CLIENT_VER=$(cargo metadata --format-version 1 | jq -r '.packages[] | select(.name=="client") | .version')
+
+          if [[ "v${RELAY_VER}" == "${TAG}" ]]; then
             cargo publish -p relay --registry gitea
           fi
-          if [[ "v${CLIENT_VER}" != "${TAG}" ]]; then
-            echo "Tag ${TAG} does not match client version v${CLIENT_VER}; skipping client publish"
-          else
+
+          if [[ "v${CLIENT_VER}" == "${TAG}" ]]; then
             cargo publish -p client --registry gitea
           fi
 
+      # -------------------------------------------------
+      # FIXED: Gitea Release Creation
+      # -------------------------------------------------
       - name: Create release
         env:
           TOKEN: ${{ secrets.TOKEN }}
@@ -154,34 +177,17 @@ jobs:
             echo "TOKEN missing; skipping release"
             exit 0
           fi
-          OWNER="${GITHUB_REPOSITORY%/*}"
-          REPO="${GITHUB_REPOSITORY#*/}"
-          VERSION="${{ steps.version.outputs.version }}"
-          PRERELEASE="${{ steps.version.outputs.is_prerelease }}"
-          BODY="Automated release for ${VERSION}."
 
-          payload=$(python - <<PY
-import json
-print(json.dumps({
-  "tag_name": "${VERSION}",
-  "target_commitish": "${GITHUB_SHA}",
-  "name": "${VERSION}",
-  "body": "${BODY}",
-  "prerelease": ${PRERELEASE}
-}))
-PY
-)
+          VERSION="${{ steps.version.outputs.version }}"
+          PRERELEASE=${{ steps.version.outputs.is_prerelease }}
+
           release=$(curl -sSf -X POST \
             -H "Authorization: token ${TOKEN}" \
             -H "Content-Type: application/json" \
-            -d "$payload" \
+            -d "{\"tag_name\":\"${VERSION}\",\"target_commitish\":\"${GITHUB_SHA}\",\"name\":\"${VERSION}\",\"body\":\"Automated release for ${VERSION}.\",\"prerelease\":${PRERELEASE}}" \
             "${GITHUB_SERVER_URL}/api/v1/repos/${OWNER}/${REPO}/releases")
 
-          release_id=$(python - <<PY
-import json,sys
-print(json.loads('''$release''')['id'])
-PY
-)
+          release_id=$(echo "$release" | jq -r '.id')
 
           for file in dist/*; do
             name=$(basename "$file")
@@ -189,4 +195,4 @@ PY
               -H "Authorization: token ${TOKEN}" \
               -F "attachment=@${file}" \
               "${GITHUB_SERVER_URL}/api/v1/repos/${OWNER}/${REPO}/releases/${release_id}/assets?name=${name}"
-          done
+          done
\ No newline at end of file