Merged Minetest

3 files changed, 51 insertions, 3 deletions

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index b234fb283..b01a89509 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -43,6 +43,12 @@ Contributions are welcome! Here's how you can help:
 4. The code's interfaces are well designed, regardless of other aspects that might need more work in the future.
 5. It uses protocols and formats which include the required compatibility.
 
+### Important note about automated GitHub checks
+
+When you submit a pull request, GitHub automatically runs checks on the Minetest Engine combined with your changes. One of these checks is called 'cpp lint / clang format', which checks code formatting. Because formatting for readability requires human judgement this check often fails and often makes unsuitable formatting requests which make code readability worse.
+
+If this check fails, look at the details to check for any clear mistakes and correct those. However, you should not apply everything ClangFormat requests. Ignore requests that make code readability worse and any other clearly unsuitable requests. Discuss in the pull request with a core developer about how to progress.
+
 ## Issues
 
 If you experience an issue, we would like to know the details - especially when a stable release is on the way.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
new file mode 100644
index 000000000..0fcfe2390
--- /dev/null
+++ b/.github/workflows/android.yml
@@ -0,0 +1,42 @@
+name: android
+
+# build on c/cpp changes or workflow changes
+on:
+  push:
+    paths:
+      - 'lib/**.[ch]'
+      - 'lib/**.cpp'
+      - 'src/**.[ch]'
+      - 'src/**.cpp'
+      - 'build/android/**'
+      - '.github/workflows/android.yml'
+  pull_request:
+    paths:
+      - 'lib/**.[ch]'
+      - 'lib/**.cpp'
+      - 'src/**.[ch]'
+      - 'src/**.cpp'
+      - 'build/android/**'
+      - '.github/workflows/android.yml'
+
+jobs:
+  build:
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Build with Gradle
+      run: cd build/android; ./gradlew assemblerelease
+    - name: Save armeabi artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: Minetest-armeabi-v7a.apk
+        path: build/android/app/build/outputs/apk/release/app-armeabi-v7a-release-unsigned.apk
+    - name: Save arm64 artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: Minetest-arm64-v8a.apk
+        path: build/android/app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ae359f5d8..71fdf3652 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -221,8 +221,8 @@ jobs:
     name: VS 2019 ${{ matrix.config.arch }}-${{ matrix.type }}
     runs-on: windows-2019 
     env:
-      VCPKG_VERSION: c7ab9d3110813979a873b2dbac630a9ab79850dc
-#                    2020.04
+      VCPKG_VERSION: 0bf3923f9fab4001c00f0f429682a0853b5749e0
+#                    2020.11
       vcpkg_packages: irrlicht zlib curl[winssl] openal-soft libvorbis libogg sqlite3 freetype luajit
     strategy:
       fail-fast: false
@@ -248,7 +248,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Restore from cache and run vcpkg
-        uses: lukka/run-vcpkg@v2
+        uses: lukka/run-vcpkg@v5
         with:
           vcpkgArguments: ${{env.vcpkg_packages}}
           vcpkgDirectory: '${{ github.workspace }}\vcpkg'