fix

.github/workflows/android.yml

@@ -12,11 +12,15 @@ jobs:
   android-template:
     runs-on: ubuntu-latest
     name: Android Template
+    container: 
+      # See how this image is built at https://github.com/Flux159/godot-docker
+      image: flux159/godot:1.0.0
     steps:
       - name: Get dependencies
         run: |
-          sudo apt-get install openjdk-8-jdk
-          echo "::set-env name=JAVA_HOME::usr/lib/jvm/java-8-openjdk-amd64"
+          apt-get update
+          apt-get install -y openjdk-8-jdk curl unzip
+          echo "::set-env name=JAVA_HOME::/usr/lib/jvm/java-8-openjdk-amd64"
 
       - name: Checkout Godot
         uses: actions/checkout@v2
@@ -43,12 +47,12 @@ jobs:
 
       - name: Install Android SDK and NDK
         run: |
-          echo "::set-env name=PATH::/usr/lib/jvm/java-8-openjdk-amd64/jre/bin:${PATH}"
-          java -version
+          echo "::set-env name=PATH::/usr/lib/jvm/java-8-openjdk-amd64/jre/bin:$(pwd)/godot-dev/build-tools/android-sdk/tools:$(pwd)/godot-dev/build-tools/android-sdk/tools/bin:${PATH}"
           echo "::set-env name=ANDROID_HOME::$(pwd)/godot-dev/build-tools/android-sdk"
           echo "::set-env name=ANDROID_NDK_ROOT::$(pwd)/godot-dev/build-tools/android-ndk"
-          ${{github.workspace}}/misc/ci/android-tools-linux.sh
-          source ~/.bashrc
+          wget https://raw.githubusercontent.com/godotengine/godot/431930b/misc/ci/android-tools-linux.sh
+          chmod +x android-tools-linux.sh
+          ./android-tools-linux.sh
 
       - name: Build godot with ECMAScript module for Android (release)
         run: |
@@ -65,9 +69,13 @@ jobs:
           name: android_release
           path: bin/
 
+      - name: Remove Previous Build
+        uses: JesseTG/rm@v1.0.2
+        with:
+          path: ${{github.workspace}}/bin/
+
       - name: Build godot with ECMAScript module for Android (debug)
         run: |
-          rm bin -r
           scons p=android android_arch=armv7 tools=no target=release_debug -j8
           scons p=android android_arch=arm64v8 tools=no target=release_debug -j8
           scons p=android android_arch=x86 tools=no target=release_debug -j8

.github/workflows/html5.yml

@@ -7,8 +7,6 @@ env:
   GODOT_BASE_BRANCH: '3.2.2-stable'
   BASE_BRANCH: master
   SCONS_CACHE_LIMIT: 4096
-  EM_VERSION: 1.39.20
-  EM_CACHE_FOLDER: 'emsdk-cache'
 
 jobs:
   html5-template:
@@ -41,37 +39,21 @@ jobs:
             ${{github.job}}-${{env.BASE_BRANCH}}-${{github.ref}}
             ${{github.job}}-${{env.BASE_BRANCH}}
 
-      # Additional cache for Emscripten generated system libraries
-      - name: Load Emscripten cache
-        id: html5-template-emscripten-cache
-        uses: actions/cache@v2
-        with:
-          path: ${{env.EM_CACHE_FOLDER}}
-          key: ${{env.EM_VERSION}}-${{github.job}}
-
-      - name: Set up Emscripten
-        uses: mymindstorm/setup-emsdk@v6
-        with:
-          version: ${{env.EM_VERSION}}
-          actions-cache-folder: ${{env.EM_CACHE_FOLDER}}
-
-      - name: Verify Emscripten setup
-        run: |
-          emcc -v
-
       - name: Build godot with ECMAScript module for HTML5 platform
+        shell: bash
         run: |
+          /emsdk/emsdk activate latest
+          source /emsdk/emsdk_env.sh
           scons p=javascript tools=no target=release -j8
-          scons p=javascript tools=no target=release_debug -j8
 
       - name: Publish artifact (release)
         uses: actions/upload-artifact@v2
         with:
           name: webassembly_release
           path: bin/godot.javascript.opt.zip
 
-      - name: Publish artifact (debug)
-        uses: actions/upload-artifact@v2
-        with:
-          name: webassembly_debug
-          path: bin/godot.javascript.opt.debug.zip
+      # - name: Publish artifact (debug)
+      #   uses: actions/upload-artifact@v2
+      #   with:
+      #     name: webassembly_debug
+      #     path: bin/godot.javascript.opt.debug.zip

.github/workflows/ios.yml

@@ -55,9 +55,13 @@ jobs:
           name: iphone_release
           path: bin/*.iphone.fat.a
 
+      - name: Remove Previous Build
+        uses: JesseTG/rm@v1.0.2
+        with:
+          path: ${{github.workspace}}/bin/
+
       - name: Build godot with ECMAScript module for iOS (debug)
         run: |
-          rm bin -r
           scons p=iphone arch=arm tools=no target=release_debug -j8
           scons p=iphone arch=arm64 tools=no target=release_debug -j8
           scons p=iphone arch=x86_64 tools=no target=release_debug -j8

.github/workflows/linux.yml

@@ -84,8 +84,6 @@ jobs:
         run: |
           scons p=x11 bits=64 tools=no target=release -j8
           scons p=x11 bits=64 tools=no target=release_debug -j8
-          scons p=x11 bits=32 tools=no target=release -j8
-          scons p=x11 bits=32 tools=no target=release_debug -j8
           strip bin/*
 
       - name: Publish artifact (release/64)
@@ -98,16 +96,4 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: linux_x11_64_debug
-          path: bin/godot.x11.opt.debug.64
-
-      - name: Publish artifact (release/32)
-        uses: actions/upload-artifact@v2
-        with:
-          name: linux_x11_32_release
-          path: bin/godot.x11.opt.32
-
-      - name: Publish artifact (debug/32)
-        uses: actions/upload-artifact@v2
-        with:
-          name: linux_x11_32_debug
-          path: bin/godot.x11.opt.debug.32
+          path: bin/godot.x11.opt.debug.64

.github/workflows/macos.yml

@@ -85,25 +85,21 @@ jobs:
       - name: Build godot with ECMAScript module for macOS (release)
         run: |
           scons p=osx arch=x86_64 tools=no target=release -j8
-          scons p=osx arch=arm64 tools=no target=release -j8
-          lipo -create bin/godot.osx.opt.x86_64 bin/godot.osx.opt.arm64 -output bin/godot.osx.opt.64
-          strip bin/godot.osx.64
+          strip bin/godot.osx.opt.x86_64
 
       - name: Publish artifact (release)
         uses: actions/upload-artifact@v2
         with:
           name: osx_release.64
-          path: bin/godot.osx.opt.64
+          path: bin/godot.osx.opt.x86_64
 
       - name: Build godot with ECMAScript module for macOS (debug)
         run: |
           scons p=osx arch=x86_64 tools=no target=release_debug -j8
-          scons p=osx arch=arm64 tools=no target=release_debug -j8
-          lipo -create bin/godot.osx.x86_64 bin/godot.osx.arm64 -output bin/godot.osx.64
-          strip bin/godot.osx.64
+          strip bin/godot.osx.opt.debug.x86_64
 
       - name: Publish artifact (debug)
         uses: actions/upload-artifact@v2
         with:
           name: osx_debug.64
-          path: bin/godot.osx.64
+          path: bin/godot.osx.opt.debug.x86_64