Merge pull request 'test release' (#5) from main into release

Reviewed-on: #5

.gitea/workflows/release.yml

@@ -7,127 +7,153 @@ on:
     branches: [release]
 
 env:
-  GODOT_VERSION: 4.3
+  GODOT_VERSION: 4.6.1
-  EXPORT_NAME: test-project
+  EXPORT_NAME: Experements
-  PROJECT_PATH: test-project
+  PROJECT_PATH: .
+  BLENDER_VERSION: 5.0.0
 
 jobs:
   export-windows:
     name: Windows Export
-    runs-on: ghcr.io/catthehacker/ubuntu:full-24.04 # Use 24.04 with godot 4
+    runs-on: ubuntu-24.04 # Use 24.04 with godot 4
-    container: barichello/godot-ci:4.3
+    container: barichello/godot-ci:4.6
     steps:
+      - name: Update and install dependencies
+        run: |
+          apt-get update
+          apt-get install -y curl gnupg
+          apt-get install -y blender
+
+      - name: Install Node.js
+        run: |
+          curl -fsSL https://deb.nodesource.com/setup_20.x | bash -
+          apt-get install -y nodejs
+
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           lfs: true
+
       - name: Setup
+        shell: bash
         run: |
-          mkdir -v -p ~/.local/share/godot/export_templates/
+          set -Eeuo pipefail
-          mkdir -v -p ~/.config/
+          BLENDER_PATH="/usr/bin/blender"
-          mv /root/.config/godot ~/.config/godot
+          mkdir -pv ~/.config/godot
-          mv /root/.local/share/godot/export_templates/${GODOT_VERSION}.stable ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable
+          mkdir -pv ~/.local/share/godot/export_templates/
+          GODOT_CFG="$(find ~/.config/godot -name "editor_settings-*.tres" | head -n 1 || true)"
+
+          if [ -z "$GODOT_CFG" ]; then
+            echo "# Missing Godot editor settings" > "$GODOT_CFG"
+            exit 1
+          fi
+
+          # Set the Blender path
+          if [ -n "${BLENDER_PATH:-}" ]; then
+            if grep -q '^filesystem/import/blender/blender_path' "$GODOT_CFG"; then
+              # Replace existing path
+              sed -i "s|^filesystem/import/blender/blender_path = .*|filesystem/import/blender/blender_path = \"$BLENDER_PATH\"|" "$GODOT_CFG"
+            else
+              # Append new path
+              echo "filesystem/import/blender/blender_path = \"$BLENDER_PATH\"" >> "$GODOT_CFG"
+            fi
+          fi
+          echo "Blender path configured in $GODOT_CFG"
+
       - name: Windows Build
+        shell: bash
         run: |
+          set -Eeuo pipefail
           mkdir -v -p build/windows
           EXPORT_DIR="$(readlink -f build)"
           cd $PROJECT_PATH
-          godot --headless --verbose --export-release "Windows Desktop" "$EXPORT_DIR/windows/$EXPORT_NAME.exe"
+          godot --headless --export-release "Windows" "$EXPORT_DIR/windows/$EXPORT_NAME.exe"
       - name: Upload Artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v3
         with:
           name: windows
           path: build/windows
 
   export-linux:
     name: Linux Export
-    runs-on: ghcr.io/catthehacker/ubuntu:full-24.04 # Use 24.04 with godot 4
+    runs-on: ubuntu-24.04 # Use 24.04 with godot 4
-    container: barichello/godot-ci:4.3
+    container: barichello/godot-ci:4.6
     steps:
+      - name: Update and install dependencies
+        run: |
+          apt-get update
+          apt-get install -y curl gnupg
+
+      - name: Install Node.js
+        run: |
+          curl -fsSL https://deb.nodesource.com/setup_20.x | bash -
+          apt-get install -y nodejs
+
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           lfs: true
       - name: Setup
+        shell: bash
         run: |
-          mkdir -v -p ~/.local/share/godot/export_templates/
+          set -Eeuo pipefail
-          mv /root/.local/share/godot/export_templates/${GODOT_VERSION}.stable ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable
+          BLENDER_PATH="/usr/bin/blender"
+          mkdir -pv ~/.config/godot
+          mkdir -pv ~/.local/share/godot/export_templates/
+          GODOT_CFG="$(find ~/.config/godot -name "editor_settings-*.tres" | head -n 1 || true)"
+
+          if [ -z "$GODOT_CFG" ]; then
+            echo "# Missing Godot editor settings" > "$GODOT_CFG"
+            exit 1
+          fi
+
+          # Set the Blender path
+          if [ -n "${BLENDER_PATH:-}" ]; then
+            if grep -q '^filesystem/import/blender/blender_path' "$GODOT_CFG"; then
+              # Replace existing path
+              sed -i "s|^filesystem/import/blender/blender_path = .*|filesystem/import/blender/blender_path = \"$BLENDER_PATH\"|" "$GODOT_CFG"
+            else
+              # Append new path
+              echo "filesystem/import/blender/blender_path = \"$BLENDER_PATH\"" >> "$GODOT_CFG"
+            fi
+          fi
+          echo "Blender path configured in $GODOT_CFG"
+
       - name: Linux Build
+        shell: bash
         run: |
+          set -Eeuo pipefail
           mkdir -v -p build/linux
           EXPORT_DIR="$(readlink -f build)"
           cd $PROJECT_PATH
-          godot --headless --verbose --export-release "Linux/X11" "$EXPORT_DIR/linux/$EXPORT_NAME.x86_64"
+          godot --headless --export-release "Linux/X11" "$EXPORT_DIR/linux/$EXPORT_NAME.x86_64"
+
       - name: Upload Artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v3
         with:
           name: linux
           path: build/linux
 
-  # export-web:
-  #   name: Web Export
-  #   runs-on: ghcr.io/catthehacker/ubuntu:full-24.04 # Use 24.04 with godot 4
-  #   container:
-  #     image: barichello/godot-ci:4.3
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v6
-  #       with:
-  #         lfs: true
-  #     - name: Setup
-  #       run: |
-  #         mkdir -v -p ~/.local/share/godot/export_templates/
-  #         mv /root/.local/share/godot/export_templates/${GODOT_VERSION}.stable ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable
-  #     - name: Web Build
-  #       run: |
-  #         mkdir -v -p build/web
-  #         EXPORT_DIR="$(readlink -f build)"
-  #         cd $PROJECT_PATH
-  #         godot --headless --verbose --export-release "Web" "$EXPORT_DIR/web/index.html"
-  #     - name: Upload Artifact
-  #       uses: actions/upload-artifact@v5
-  #       with:
-  #         name: web
-  #         path: build/web
-  #     - name: Install rsync 📚
-  #       run: |
-  #         apt-get update && apt-get install -y rsync
-  #     - name: Deploy to GitHub Pages 🚀
-  #       uses: JamesIves/github-pages-deploy-action@releases/v4
-  #       with:
-  #         branch: gh-pages # The branch the action should deploy to.
-  #         folder: build/web # The folder the action should deploy.
-
-  export-mac:
-    name: Mac Export
-    runs-on: ghcr.io/catthehacker/ubuntu:full-24.04 # Use 24.04 with godot 4
-    container: barichello/godot-ci:4.3
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-        with:
-          lfs: true
-      - name: Setup
-        run: |
-          mkdir -v -p ~/.local/share/godot/export_templates/
-          mv /root/.local/share/godot/export_templates/${GODOT_VERSION}.stable ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable
-      - name: Mac Build
-        run: |
-          mkdir -v -p build/mac
-          EXPORT_DIR="$(readlink -f build)"
-          cd $PROJECT_PATH
-          godot --headless --verbose --export-release "macOS" "$EXPORT_DIR/mac/$EXPORT_NAME.zip"
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v5
-        with:
-          name: mac
-          path: build/mac
-
   create-release:
     name: Create Release
     runs-on: ubuntu-latest
-    needs: [export-mac, export-linux, export-windows]
+    needs: [export-linux, export-windows]
     steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Download Windows Artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: windows
+          path: build/windows
+
+      - name: Download Linux Artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: linux
+          path: build/linux
+
       - name: Extract version and body from CHANGELOG
         id: changelog
         run: |
@@ -157,6 +183,11 @@ jobs:
           echo "$BODY" >> $GITHUB_OUTPUT
           echo "EOF" >> $GITHUB_OUTPUT
 
+      - name: Zipping exports
+        run: |
+          zip -r windows-${{ steps.changelog.outputs.version }}.zip build/windows
+          zip -r linux-${{ steps.changelog.outputs.version }}.zip build/linux
+
       - name: Create Release
         uses: akkuman/gitea-release-action@v1
         with:
@@ -166,3 +197,6 @@ jobs:
           body: ${{ steps.changelog.outputs.body }}
           draft: false
           token: ${{ secrets.GITEA_TOKEN }}
+          files: |
+            windows-${{ steps.changelog.outputs.version }}.zip
+            linux-${{ steps.changelog.outputs.version }}.zip