From f9cc75e8e0f151e327e472314e6a838c935bc167 Mon Sep 17 00:00:00 2001
From: Martin Capitanio <capnm@capitanio.org>
Date: Thu, 8 Oct 2020 05:49:59 +0200
Subject: [PATCH] CI: Fix Android and HTML5 workflows

The current version will soon stop working, according
to Github's friendly warnig:

The `set-env` command is deprecated and will be disabled soon.
Please upgrade to using Environment Files. For more information see:
https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/
---
 .github/workflows/android_builds.yml    | 18 ++++++++++--------
 .github/workflows/javascript_builds.yml |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/android_builds.yml b/.github/workflows/android_builds.yml
index 21ae05518b2..2d26be1671d 100644
--- a/.github/workflows/android_builds.yml
+++ b/.github/workflows/android_builds.yml
@@ -21,20 +21,22 @@ jobs:
           sudo cp -f misc/ci/sources.list /etc/apt/sources.list
           sudo apt-get update
 
-      # Install all packages (except scons)
-      - name: Configure dependencies
+      # The system image has a non-working Java version:
+      # /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/bin/java
+      # openjdk version "11.0.8" 2020-07-14
+      # Install the official version.
+      - name: Install Java
         run: |
-         sudo apt-get install openjdk-8-jdk
-         echo "::set-env name=JAVA_HOME::usr/lib/jvm/java-8-openjdk-amd64"
+          sudo apt-get install openjdk-8-jdk
+          sudo update-java-alternatives -s java-1.8.0-openjdk-amd64
+          echo "JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64" >> $GITHUB_ENV
 
       - 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=ANDROID_HOME::$(pwd)/godot-dev/build-tools/android-sdk"
-          echo "::set-env name=ANDROID_NDK_ROOT::$(pwd)/godot-dev/build-tools/android-ndk"
           misc/ci/android-tools-linux.sh
-          source ~/.bashrc
+          echo "ANDROID_HOME=$(pwd)/godot-dev/build-tools/android-sdk" >> $GITHUB_ENV
+          echo "ANDROID_NDK_ROOT=$(pwd)/godot-dev/build-tools/android-ndk" >> $GITHUB_ENV
 
       # Upload cache on completion and check it out now
       - name: Load .scons_cache directory
diff --git a/.github/workflows/javascript_builds.yml b/.github/workflows/javascript_builds.yml
index 0805730c881..448148680d1 100644
--- a/.github/workflows/javascript_builds.yml
+++ b/.github/workflows/javascript_builds.yml
@@ -60,7 +60,7 @@ jobs:
           scons --version
 
       - name: Set up Emscripten latest
-        uses: mymindstorm/setup-emsdk@v6
+        uses: mymindstorm/setup-emsdk@v7
         with:
           version: ${{env.EM_VERSION}}
           actions-cache-folder: ${{env.EM_CACHE_FOLDER}}