0
0
mirror of https://github.com/florisboard/florisboard.git synced 2024-09-19 11:32:18 +02:00

Fix GitHub workflows not setting up cmake

This commit is contained in:
Patrick Goldinger 2021-05-12 19:40:56 +02:00
parent bcad0af35e
commit 1ef38fe7f3
4 changed files with 5 additions and 4 deletions

View File

@ -9,7 +9,7 @@ insert_final_newline = true
max_line_length = 120
trim_trailing_whitespace = true
[{*.har,*.json}]
[{*.har,*.json,*yml}]
indent_size = 2
[*.kt]

View File

@ -16,6 +16,8 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Setup CMake and Ninja
uses: lukka/get-cmake@v3.20.1
- uses: actions/cache@v2
with:
path: |
@ -25,7 +27,7 @@ jobs:
restore-keys: |
${{ runner.os }}-gradle-
- name: Build with Gradle
run: ./gradlew clean assemble
run: ./gradlew clean assembleDebug
- uses: actions/upload-artifact@v2
with:
name: app-debug.apk

View File

@ -54,7 +54,6 @@ android {
externalNativeBuild {
cmake {
path("src/main/cpp/CMakeLists.txt")
version = "3.18.1"
}
}

View File

@ -1,7 +1,7 @@
# For more information about using CMake with Android Studio, read the
# documentation: https://d.android.com/studio/projects/add-native-code.html
cmake_minimum_required(VERSION 3.18.1)
cmake_minimum_required(VERSION 3.10.2)
project("florisboard")