asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CI: Fix Android and HTML5 workflows

Browse source 
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/
This commit is contained in:
Martin Capitanio 2020-10-08 05:49:59 +02:00
parent 4040cd350d
commit f9cc75e8e0
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
.github/workflows/android_builds.yml vendored
View file

@ -21,20 +21,22 @@ jobs:
sudo cp -f misc/ci/sources.list /etc/apt/sources.list sudo cp -f misc/ci/sources.list /etc/apt/sources.list
sudo apt-get update sudo apt-get update
# Install all packages (except scons) # The system image has a non-working Java version:
- name: Configure dependencies # /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: | run: |
sudo apt-get install openjdk-8-jdk sudo apt-get install openjdk-8-jdk
echo "::set-env name=JAVA_HOME::usr/lib/jvm/java-8-openjdk-amd64" 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 - name: Install Android SDK and NDK
run: | run: |
echo "::set-env name=PATH::/usr/lib/jvm/java-8-openjdk-amd64/jre/bin:${PATH}"
java -version 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 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 # Upload cache on completion and check it out now
- name: Load .scons_cache directory - name: Load .scons_cache directory

2
.github/workflows/javascript_builds.yml vendored
View file

@ -60,7 +60,7 @@ jobs:
scons --version scons --version
- name: Set up Emscripten latest - name: Set up Emscripten latest
uses: mymindstorm/setup-emsdk@v6 uses: mymindstorm/setup-emsdk@v7
with: with:
version: ${{env.EM_VERSION}} version: ${{env.EM_VERSION}}
actions-cache-folder: ${{env.EM_CACHE_FOLDER}} actions-cache-folder: ${{env.EM_CACHE_FOLDER}}