revert: godot 4.3 and gdext 0.1.3

.github/workflows/android-build.yml

@@ -0,0 +1,71 @@
+on:
+  push:
+    branches:
+    - main
+
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: 'Branch name'
+        required: true
+        default: 'main'
+
+name: Quest & Android Builds
+
+jobs:
+  build:
+    runs-on: bigrunner
+    container:
+      image: docker://kuruk/dcl-godot-android-builder:4.2
+      volumes:
+      - /home/user/.cache/devgodot:/github/home/.cache/devgodot
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        ref: ${{ github.event_name == 'push' && github.ref || github.event.inputs.branch }}
+    - name: Install Android targets
+      run: |
+        echo $PATH
+    - name: Set up Rust
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: 1.77.2
+        override: true
+        components: clippy, rustfmt
+
+    - name: Install Android targets
+      run: |
+        rustup target add aarch64-linux-android
+        rustup target add x86_64-linux-android
+    - name: Build
+      run: |
+        bash build-android-apk.sh
+
+    # if libdclgodot.so does not exist, the build failed, nothing to upload
+    - name: Copy Android Artifacts
+      if: success() || failure()
+      run: |
+        mkdir -p android-artifacts
+        cp godot/lib/android/arm64/libdclgodot.so android-artifacts/
+        mv android.apk android-artifacts/ || true
+        mv android-unsigned.aab android-artifacts/ || true
+
+    - name: Copy Meta Quest Artifacts
+      if: success() || failure()
+      run: |
+        mkdir -p meta-quest-artifacts
+        cp godot/lib/android/arm64/libdclgodot.so meta-quest-artifacts/
+        mv meta-quest.apk meta-quest-artifacts/ || true
+        mv meta-quest-unsigned.aab meta-quest-artifacts/ || true
+
+    - uses: actions/upload-artifact@v4
+      if: success() || failure()
+      with:
+        name: Android APK
+        path: android-artifacts/
+
+    - uses: actions/upload-artifact@v4
+      if: success() || failure()
+      with:
+        name: Meta Quest APK
+        path: meta-quest-artifacts/

.github/workflows/android_builds.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: bigrunner
     container:
       # image generated at: https://github.com/decentraland/godot-docker-builder
-      image: quay.io/decentraland/dcl-godot-android-builder:02ee2c576f49c1397710a6b90098549725bad4a5
+      image: docker://kuruk/dcl-godot-android-builder:4.2
       volumes:
         - /home/user/.cache/devgodot:/github/home/.cache/devgodot
     steps:
@@ -22,7 +22,7 @@ jobs:
       - name: Set up Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.79
+          toolchain: 1.77.2
           override: true
           components: clippy, rustfmt
       - name: Set up cache

.github/workflows/coverage.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Install stable toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.79
+          toolchain: 1.77.2
           override: true
           components: llvm-tools-preview
 

.github/workflows/docker_tests.yml

@@ -28,4 +28,12 @@ jobs:
           ls -la output/
           cargo run -- compare-image-folders \
             --snapshots tests/snapshots/avatar-image-generation/ \
-            --result ${{ github.workspace }}/output/
+            --result ${{ github.workspace }}/output/
+
+      - name: Upload artifacts
+        if: success() || failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: avatar-snapshots
+          path: |
+            ${{ github.workspace }}/output/**/*

.github/workflows/linux_builds.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.79
+          toolchain: 1.77.2
           override: true
 
       - name: Set up cache

.github/workflows/macos_builds.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.79
+          toolchain: 1.77.2
           override: true
 
       # Dependencies section

.github/workflows/runner.yml

@@ -46,7 +46,7 @@ jobs:
     name: 🐳 Docker builds
     needs: linux-build
     uses: ./.github/workflows/docker_builds.yml
-    if: github.ref == 'refs/heads/main'
+    # if: github.ref == 'refs/heads/main'
     secrets:
       QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
       QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }}

.github/workflows/static_checks.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.79
+          toolchain: 1.77.2
           override: true
           components: clippy, rustfmt
       - run: rustup component add rustfmt

.github/workflows/windows_builds.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.79
+          toolchain: 1.77.2
           override: true
 
       - name: Set up cache

Cargo.toml

@@ -18,4 +18,4 @@ serde_json = { version = "1.0.92", features = ["raw_value"] }
 glob = "*"
 tokio = { version = "1.26.0", features = ["sync", "rt-multi-thread", "net"] }
 directories = "5.0.1"
-image = "0.25.4"
+image = "0.24.9"

README.md

@@ -15,9 +15,9 @@
     - **MacOS**: `brew install ffmpeg@6 pkg-config`
     - **Windows**: 
       - download and unzip `https://www.gyan.dev/ffmpeg/builds/ffmpeg-release-full-shared.7z`
+      - set `LIBCLANG_PATH` = `path to LLVM\x64\bin` (this is packaged with visual studio, or can be downloaded separately)
       - set `FFMPEG_DIR` = `root folder where ffmpeg has been unzipped`
       - add `ffmpeg\bin` to your `PATH`
-      - set `LIBCLANG_PATH` = `path to LLVM\x64\bin` (this is packaged with visual studio, or can be downloaded separately)
     - the `.github/workflows/ci.yml` file can be useful to guide you
 
 4. Run `cargo run -- install` in the repo root folder.
@@ -34,7 +34,7 @@
 Execute the following commands for building Godot:
 ```bash
 # Run Docker
-docker run -v {godot-explorer-repo-path}:/app/ -it quay.io/decentraland/dcl-godot-android-builder:99091016236094cb776bd9cb1298602e56b8cdab
+docker run -v {godot-explorer-repo-path}:/app/ -it kuruk/dcl-godot-android-builder:latest
 
 # Compile for Android
 cd lib

build-android-apk.sh

@@ -7,12 +7,7 @@ EXPLORER_PATH=$(pwd)
 if [ ! -d ${EXPLORER_PATH}/godot/android/ ]
 then
     echo "Checkout godot android template"
-    git clone -b bump-4.3 https://github.com/decentraland/godot-explorer-android-template ${EXPLORER_PATH}/godot/android
-fi
-
-# temp workaround: check if JAVA_HOME is not set
-if [ -z "$JAVA_HOME" ]; then
-  export JAVA_HOME="/usr/lib/jvm/java-17-openjdk-amd64"
+    git clone https://github.com/decentraland/godot-explorer-android-template ${EXPLORER_PATH}/godot/android
 fi
 
 echo "Build for Linux x86_64"
@@ -23,7 +18,7 @@ cargo run -- run --only-build
 echo "Link export templates"
 mkdir -p ${HOME}/.local/share/godot/export_templates/
 cd ${HOME}/.local/share/godot/export_templates/
-ln -sf ${EXPLORER_PATH}/.bin/godot/templates/templates/ 4.3.stable
+ln -sf ${EXPLORER_PATH}/.bin/godot/templates/templates/ 4.2.1.stable
 
 set -e 
 
@@ -51,25 +46,7 @@ cd ${EXPLORER_PATH}/godot/
 
 # Build the .aab without x86_64 architecture
 echo "Export Godot android.apk"
-
-# Define the command to be executed
-COMMAND="${EXPLORER_PATH}/.bin/godot/godot4_bin -e --headless --export-debug Android ${EXPLORER_PATH}/android.apk"
-
-# Try executing the command
-if ! $COMMAND; then
-    echo "First attempt failed, retrying in 5 seconds..."
-    sleep 5 # Wait for 5 seconds before retrying
-
-    # Retry executing the command
-    if ! $COMMAND; then
-        echo "Second attempt failed."
-    else
-        echo "Second attempt succeeded."
-    fi
-else
-    echo "First attempt succeeded."
-fi
-
+${EXPLORER_PATH}/.bin/godot/godot4_bin -e --headless --export-debug Android ${EXPLORER_PATH}/android.apk || true
 ${EXPLORER_PATH}/.bin/godot/godot4_bin -e --headless --export-debug Quest ${EXPLORER_PATH}/meta-quest.apk || true
 
 

godot/.gitignore

@@ -5,7 +5,7 @@
 .godot/exported
 .godot/uid_cache.bin
 
-/android/
+android/
 
 # Godot-specific ignores
 .import/
@@ -24,7 +24,4 @@ mono_crash.*.json
 # System/tool-specific ignores
 .directory
 .DS_Store
-*~
-
-# Decentraland ignores
-/output/
+*~

godot/.godot/extension_list.cfg

@@ -1,5 +1,5 @@
 res://dclgodot.gdextension
-res://addons/godotopenxrvendors/plugin.gdextension
 res://addons/godotopenxrvendors/khronos/plugin.gdextension
+res://addons/godotopenxrvendors/lynx/plugin.gdextension
 res://addons/godotopenxrvendors/meta/plugin.gdextension
 res://addons/godotopenxrvendors/pico/plugin.gdextension

godot/.godot/imported/Background.jpeg-28aab23ca3bbcda989ba2a2f954a44e6.md5

@@ -1,3 +1,3 @@
 source_md5="7ed3b96e6eaf89b0aef228d44c1dbf16"
-dest_md5="2d9df2dbe874781994ab1113a1bd1980"
+dest_md5="4af852a66ed30d732304b69e24280a9c"
 

godot/.godot/imported/Backpack.svg-7b826c6173ff26eb45a6ad1aef22f441.md5

@@ -1,3 +1,3 @@
 source_md5="0b8c831fb62f32db8b904fd4ba325d55"
-dest_md5="197ac2b3ae096db1be8f22635059eb2f"
+dest_md5="f73ad9a47aff7a32ce84355d1a7bf08e"
 

godot/.godot/imported/Baroque_Ornament.glb-b26cfaac015182b0fb4f213a48b8f91e.md5

@@ -1,3 +1,3 @@
 source_md5="3a745a57397c0a26845657426806f36c"
-dest_md5="5db9fbcf6ae407ed4b4b55166bb91fa4"
+dest_md5="67b24a1c3584ef4ad4068518951c7ce6"
 

godot/.godot/imported/Baroque_Ornament_Genesis_TX.png-98fabe811602cb5bf83fd74cfc60bc53.md5

@@ -1,3 +1,3 @@
 source_md5="47d1bb85b85e50942b9140479f701447"
-dest_md5="cce97236ab11b52547e640af2dbd1332"
+dest_md5="f7763a28e3a4d30850b8c7809d676dff"
 

godot/.godot/imported/Blocky.glb-55c14d48f2813c03e5fef1897f1dd7a1.md5

@@ -1,3 +1,3 @@
 source_md5="89775f60ee0ee580c0958c27e395d947"
-dest_md5="017aa8b916fa76af5c692f8b93886f0d"
+dest_md5="bddb4ea76ba1fb9e56cef2e45b05dc08"
 

godot/.godot/imported/Canvas.glb-9f410b9ad3c3e45b3b29ac671931dffd.md5

@@ -1,3 +1,3 @@
 source_md5="db74371123c58df3d6cfdec1ae411f01"
-dest_md5="3b18c00d01291ef5bbe5d836ba10b3d5"
+dest_md5="5eb5db622aaa3630fc5014d3172fd706"
 

godot/.godot/imported/Chat.svg-fc3ef9a7528d038eff44a29279fab871.md5

@@ -1,3 +1,3 @@
 source_md5="cabfbc5c01966744e247165878f00fb3"
-dest_md5="578feedb48d03c5e57df955d2abe5722"
+dest_md5="b1f4471f46b5876d33767a25342f80f3"
 

godot/.godot/imported/Classic.glb-d58072517faa47f897c9242b07224b6e.md5

@@ -1,3 +1,3 @@
 source_md5="f7adccfade3fad93bb7939a803687d08"
-dest_md5="fd47b65d3432ab065557fad95e3b6747"
+dest_md5="e713e28e4dea5482d7afde30e6f646f6"
 

godot/.godot/imported/ColorPalette.svg-986fe568a14db27f8a89203b8988c62a.md5

@@ -1,3 +1,3 @@
 source_md5="1f9e8168d767c72c646e3ed7130b8f0b"
-dest_md5="31ec21ec7e0af81c8ce45c1daf0868d8"
+dest_md5="ea7a7c620d80e73596ecf9d736837975"
 

godot/.godot/imported/DecentralandLogo.svg-b19dfddec48e5184c2df9e987215fb93.md5

@@ -1,3 +1,3 @@
 source_md5="5ef0a381fc199464c1c4488eceeedcfd"
-dest_md5="e455e231a37c9de6f3469c7960ce0965"
+dest_md5="265944599a640ad9600d01b05671d31c"
 

godot/.godot/imported/Diamond_Ornament.glb-a7352287ec8cb054fda77f410ef68b56.md5

@@ -1,3 +1,3 @@
 source_md5="8e79fd45730c701aaf3af8a9c3ebb240"
-dest_md5="6f6d5af5977765e6f86d73a27c0318ff"
+dest_md5="d49102cf0005100456a9fea7226e1ec2"
 

godot/.godot/imported/Diamond_Ornament_Genesis_TX.png-31a25101775da3e601c7b09008f5f83b.md5

@@ -1,3 +1,3 @@
 source_md5="47d1bb85b85e50942b9140479f701447"
-dest_md5="cce97236ab11b52547e640af2dbd1332"
+dest_md5="f7763a28e3a4d30850b8c7809d676dff"
 

godot/.godot/imported/Dislike solid.svg-894cc3980cef8436144f071e6ff7204d.md5

@@ -1,3 +1,3 @@
 source_md5="ef3ecb5595fcb62dd4edfd98843e2528"
-dest_md5="8e032222a4ccfe7a783f0b813a1ce7e8"
+dest_md5="b789e51a5a82a7b66295cd5893f0ab9c"
 

godot/.godot/imported/Dislike.svg-e9de8b86e4990514afec400bf75d7a40.md5

@@ -1,3 +1,3 @@
 source_md5="6547adc919b5c1f8590a50dc39a816dc"
-dest_md5="81804ed40efd8e0c568405054f246e94"
+dest_md5="375e62fe964ee8d31aa18b3067804a9f"
 

godot/.godot/imported/Ellipse.svg-eac5d038aeaf5cb09778485e04f700cd.md5

@@ -1,3 +1,3 @@
 source_md5="b6ce2927fbd3508e329329a410195a88"
-dest_md5="3722ee270abaf7cb43aadbc11df385fd"
+dest_md5="60b4806fa0bc4ac17a0912fdf50fce1b"
 

godot/.godot/imported/EmoteWheelDeck.svg-7073de1c070b028b73065889b028e0de.md5

@@ -1,3 +1,3 @@
 source_md5="054963e6df61332c34fc042a31b51df7"
-dest_md5="03806107c0e62429936b2e4c3e859d4b"
+dest_md5="4061ce937f6ab1d17a2d6a283737ac53"
 

godot/.godot/imported/Emotes.svg-8368a48d2b35465529d5ee3bfd8a09d4.md5

@@ -1,3 +1,3 @@
 source_md5="cbc6587945825e93268356446a0f7fa1"
-dest_md5="97a2f9ecd302b51c220cba55e25de10d"
+dest_md5="41de72dcfba4304d36df5dcf10f34f59"
 

godot/.godot/imported/EmptyParcels-TX.png-14bfaad7b7912dc4a72b4e1ff5267c87.md5

@@ -1,3 +1,3 @@
 source_md5="c329009afd413d71c151d33d23820065"
-dest_md5="70d6a83281fd87c53d828ccab0662e3c"
+dest_md5="2d64bae19e1e2da272c723b8d4ba8dbf"
 

godot/.godot/imported/Exit.svg-b834dc8a7c5dd05761702508df00f2e9.md5

@@ -1,3 +1,3 @@
 source_md5="9a2c4a4ae52e5319d4b1336955f82d0c"
-dest_md5="9e3ac78c243dc957cc4f77fcd36f80df"
+dest_md5="396a848cd380208cbc833fb8f5ad3ea7"
 

godot/.godot/imported/Floor_Grass.png-660e164afd83e5b9069f6cdea9f79b9b.md5

@@ -1,3 +1,3 @@
 source_md5="e0dbd1f1b2a53190d6e11f201e637912"
-dest_md5="774e850ae9e002d712b2acdba138e9de"
+dest_md5="f3353a370eb890ee75bf1947aaf3bf3e"
 

godot/.godot/imported/Gold_Carved.glb-68c293d362d4a12165b6482ceef2ade6.md5

@@ -1,3 +1,3 @@
 source_md5="9a903d09e871bcafff092230a5e5ba53"
-dest_md5="2efb5cf6d8aa314ab1481c636752f978"
+dest_md5="fa4e1deab9f99d8f9a7fdc150ff155dc"
 

godot/.godot/imported/Gold_Carved_Genesis_TX.png-4356225392fe777f0e4165e58db045a8.md5

@@ -1,3 +1,3 @@
 source_md5="47d1bb85b85e50942b9140479f701447"
-dest_md5="cce97236ab11b52547e640af2dbd1332"
+dest_md5="f7763a28e3a4d30850b8c7809d676dff"
 

godot/.godot/imported/Gold_Edges.glb-252425687b22f5c2023bb74e43ba33f1.md5

@@ -1,3 +1,3 @@
 source_md5="94224893de2343758b5ca9f276a927f0"
-dest_md5="ac5b68162be8f3834d770cae10d926e7"
+dest_md5="2efa05726b53e19ef2bd33d8207abb75"
 

godot/.godot/imported/Gold_Edges_Genesis_TX.png-3d7d28d1fc1bafeb2ce9a1d8c8f4a3c9.md5

@@ -1,3 +1,3 @@
 source_md5="47d1bb85b85e50942b9140479f701447"
-dest_md5="cce97236ab11b52547e640af2dbd1332"
+dest_md5="f7763a28e3a4d30850b8c7809d676dff"
 

godot/.godot/imported/Gold_Rounded.glb-6e1134d8744a0188190d3ae542ff1d67.md5

@@ -1,3 +1,3 @@
 source_md5="35e6744e6d620f3d92142d1939131300"
-dest_md5="16ff23b8487c35e0f957e0ad3400a986"
+dest_md5="166ed65f57fb49e8aafd3b1f038b211f"
 

godot/.godot/imported/Gold_Rounded_Genesis_TX.png-f8c72b8455fa9d2ff29232859de00b68.md5

@@ -1,3 +1,3 @@
 source_md5="47d1bb85b85e50942b9140479f701447"
-dest_md5="cce97236ab11b52547e640af2dbd1332"
+dest_md5="f7763a28e3a4d30850b8c7809d676dff"
 

godot/.godot/imported/Gold_Wide.glb-f5c49d7c940efe7ea60c2aeca228aa9e.md5

@@ -1,3 +1,3 @@
 source_md5="6d91125067301319320abfcd19bb8472"
-dest_md5="14277c2c90fcb1833d94b0ac49a31261"
+dest_md5="07b515a8d76a6300461d02d8e7f47b54"