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:
parent
bcad0af35e
commit
1ef38fe7f3
@ -9,7 +9,7 @@ insert_final_newline = true
|
|||||||
max_line_length = 120
|
max_line_length = 120
|
||||||
trim_trailing_whitespace = true
|
trim_trailing_whitespace = true
|
||||||
|
|
||||||
[{*.har,*.json}]
|
[{*.har,*.json,*yml}]
|
||||||
indent_size = 2
|
indent_size = 2
|
||||||
|
|
||||||
[*.kt]
|
[*.kt]
|
||||||
|
4
.github/workflows/android.yml
vendored
4
.github/workflows/android.yml
vendored
@ -16,6 +16,8 @@ jobs:
|
|||||||
uses: actions/setup-java@v1
|
uses: actions/setup-java@v1
|
||||||
with:
|
with:
|
||||||
java-version: 1.8
|
java-version: 1.8
|
||||||
|
- name: Setup CMake and Ninja
|
||||||
|
uses: lukka/get-cmake@v3.20.1
|
||||||
- uses: actions/cache@v2
|
- uses: actions/cache@v2
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
@ -25,7 +27,7 @@ jobs:
|
|||||||
restore-keys: |
|
restore-keys: |
|
||||||
${{ runner.os }}-gradle-
|
${{ runner.os }}-gradle-
|
||||||
- name: Build with Gradle
|
- name: Build with Gradle
|
||||||
run: ./gradlew clean assemble
|
run: ./gradlew clean assembleDebug
|
||||||
- uses: actions/upload-artifact@v2
|
- uses: actions/upload-artifact@v2
|
||||||
with:
|
with:
|
||||||
name: app-debug.apk
|
name: app-debug.apk
|
||||||
|
@ -54,7 +54,6 @@ android {
|
|||||||
externalNativeBuild {
|
externalNativeBuild {
|
||||||
cmake {
|
cmake {
|
||||||
path("src/main/cpp/CMakeLists.txt")
|
path("src/main/cpp/CMakeLists.txt")
|
||||||
version = "3.18.1"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# For more information about using CMake with Android Studio, read the
|
# For more information about using CMake with Android Studio, read the
|
||||||
# documentation: https://d.android.com/studio/projects/add-native-code.html
|
# 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")
|
project("florisboard")
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user