diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 3277183..1fed7e3 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -22,6 +22,7 @@ jobs: run: | apt-get update apt-get install -y curl gnupg + apt-get install -y blender - name: Install Node.js run: | @@ -36,27 +37,29 @@ jobs: - name: Setup shell: bash run: | - mkdir -v -p ~/.local/share/godot/export_templates/ - mkdir -v -p ~/.config/ set -Eeuo pipefail - echo "Installing Blender ${{ env.BLENDER_VERSION }}..." - MAJOR_MINOR="$(echo "${{ env.BLENDER_VERSION }}" | cut -d. -f1,2)" - BLENDER_URL="https://download.blender.org/release/Blender${MAJOR_MINOR}/blender-${{ env.BLENDER_VERSION }}-linux-x64.tar.xz" - wget -q "$BLENDER_URL" -O ~/blender.tar.xz - tar -xf ~/blender.tar.xz -C ~/ - BLENDER_DIR="$(find ~ -maxdepth 1 -name "blender-*" -type d | head -n 1)" - echo "${BLENDER_DIR}" >> "$GITHUB_PATH" - echo "BLENDER_PATH=${BLENDER_DIR}/blender" >> "$GITHUB_ENV" - "${BLENDER_DIR}/blender" --version - + 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 [ -n "$GODOT_CFG" ]; then - if [ -n "${BLENDER_PATH:-}" ]; then - grep -q '^filesystem/import/blender/blender_path' "$GODOT_CFG" \ - && sed -i "s|^filesystem/import/blender/blender_path = .*|filesystem/import/blender/blender_path = \"$BLENDER_PATH\"|" "$GODOT_CFG" \ - || echo "filesystem/import/blender/blender_path = \"$BLENDER_PATH\"" >> "$GODOT_CFG" + + if [ -z "$GODOT_CFG" ]; then + # No settings file exists → create a new one + GODOT_CFG="$HOME/.config/godot/editor_settings-4.tres" + echo "# Godot editor settings" > "$GODOT_CFG" + 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 run: | @@ -71,10 +74,10 @@ jobs: name: windows path: build/windows - # export-linux: - # name: Linux Export - # runs-on: ubuntu-24.04 # Use 24.04 with godot 4 - # container: barichello/godot-ci:4.6 + export-linux: + name: Linux Export + runs-on: ubuntu-24.04 # Use 24.04 with godot 4 + container: barichello/godot-ci:4.6 # steps: # - name: Update and install dependencies # run: |