Merge branch 'dev'

.gitea/workflows/dev-verify.yml

@@ -12,35 +12,24 @@ on:
 jobs:
   verify:
     runs-on: ubuntu-latest
+    container:
+      image: gradle:8.11.1-jdk21
     env:
       GITEA_TOKEN: ${{ github.token }}
       GITEA_REPO_URL: ${{ github.server_url }}/${{ github.repository }}.git
-      GRADLE_USER_HOME: ${{ github.workspace }}/.gradle-home
-
     steps:
       - name: Prepare source
         shell: bash
         run: |
           set -euo pipefail
 
-          if [ ! -f build.gradle ] && [ ! -f build.gradle.kts ]; then
+          if [ ! -f build.gradle ]; then
             git -c http.extraHeader="Authorization: token ${GITEA_TOKEN}" \
               clone --depth 1 "${GITEA_REPO_URL}" .
           fi
 
-      - name: Set up Java 21
-        uses: actions/setup-java@v5
-        with:
-          distribution: temurin
-          java-version: 21
-          cache: gradle
-
-      - name: Make wrapper executable
-        shell: bash
-        run: chmod +x ./gradlew
-
       - name: Verify
         shell: bash
         run: |
           set -euo pipefail
-          ./gradlew compileClientJava --daemon --build-cache --parallel --stacktrace
+          gradle --no-daemon compileClientJava

.gitea/workflows/main-release.yml

@@ -14,6 +14,8 @@ permissions:
 jobs:
   build:
     runs-on: ubuntu-latest
+    container:
+      image: gradle:8.11.1-jdk21
     env:
       GITEA_TOKEN: ${{ github.token }}
       GITEA_API_URL: ${{ github.server_url }}/api/v1
@@ -21,46 +23,22 @@ jobs:
       GITEA_REPO_URL: ${{ github.server_url }}/${{ github.repository }}.git
       GITEA_REF_NAME: ${{ github.ref_name }}
       GITEA_SHA: ${{ github.sha }}
-      GRADLE_USER_HOME: ${{ github.workspace }}/.gradle-home
-
     steps:
       - name: Prepare source
         shell: bash
         run: |
           set -euo pipefail
 
-          if [ ! -f build.gradle ] && [ ! -f build.gradle.kts ]; then
+          if [ ! -f build.gradle ]; then
             git -c http.extraHeader="Authorization: token ${GITEA_TOKEN}" \
               clone --depth 1 "${GITEA_REPO_URL}" .
           fi
 
-      - name: Set up Java 21
-        uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: 21
-
-      - name: Cache Gradle
-        uses: actions/cache@v4
-        with:
-          path: |
-            .gradle-home/caches
-            .gradle-home/daemon
-            .gradle-home/native
-            .gradle-home/wrapper
-          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', '**/gradle.properties', '**/settings.gradle*', '**/libs.versions.toml') }}
-          restore-keys: |
-            gradle-${{ runner.os }}-
-
-      - name: Make wrapper executable
-        shell: bash
-        run: chmod +x ./gradlew
-
       - name: Build
         shell: bash
         run: |
           set -euo pipefail
-          ./gradlew remapJar --build-cache --parallel --stacktrace
+          gradle --no-daemon build
 
       - name: Publish Gitea release
         if: github.event_name != 'pull_request'
@@ -68,12 +46,7 @@ jobs:
         run: |
           set -euo pipefail
 
-          jar_path="$(find build/libs -maxdepth 1 -type f -name '*.jar' ! -name '*-sources.jar' | head -n 1)"
-          if [ -z "${jar_path}" ]; then
-            echo "No release jar found in build/libs"
-            exit 1
-          fi
-
+          jar_path="$(ls -1 build/libs/*.jar | head -n 1)"
           if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
             release_tag="${GITEA_REF_NAME}"
             release_name="${GITEA_REF_NAME}"
@@ -102,5 +75,6 @@ jobs:
 
           curl -fsS \
             -H "Authorization: token ${GITEA_TOKEN}" \
+            -H "Content-Type: multipart/form-data" \
             -F "attachment=@${jar_path}" \
-            "${GITEA_API_URL}/repos/${GITEA_REPO}/releases/${release_id}/assets?name=$(basename "${jar_path}")"
+            "${GITEA_API_URL}/repos/${GITEA_REPO}/releases/${release_id}/assets?name=$(basename "${jar_path}")"