Merge branch 'dev' into gsl-experiment

# Conflicts:
#	.github/workflows/gradle.yml
This commit is contained in:
Iaroslav Postovalov 2020-12-12 21:09:07 +07:00
commit 386b063c94
No known key found for this signature in database
GPG Key ID: 46E15E4A31B3BCD7

View File

@ -23,21 +23,23 @@ jobs:
uses: actions/cache@v2
with:
path: |
**/.gradle
**/build
key: gradle_6_6_1
restore-keys: gradle_6_6_1
.gradle
build
~/.gradle
key: gradle
restore-keys: gradle
- name: Cache konan
uses: actions/cache@v2
with:
path: |
~/.konan/dependencies
~/.konan/kotlin-native-prebuilt-linux-1.4.20
key: ${{ runner.os }}-konan-1.4.20
restore-keys: ${{ runner.os }}-konan-1.4.20
~/.konan/kotlin-native-prebuilt-linux-*
key: ${{ runner.os }}-konan
restore-keys: ${{ runner.os }}-konan
- name: Build with Gradle
run: ./gradlew -Dorg.gradle.daemon=false --build-cache build
build-osx:
runs-on: macos-latest
@ -53,19 +55,20 @@ jobs:
uses: actions/cache@v2
with:
path: |
**/.gradle
**/build
key: gradle_6_6_1
restore-keys: gradle_6_6_1
.gradle
build
~/.gradle
key: gradle
restore-keys: gradle
- name: Cache konan
uses: actions/cache@v2
with:
path: |
~/.konan/dependencies
~/.konan/kotlin-native-prebuilt-macos-1.4.20
key: ${{ runner.os }}-konan-1.4.20
restore-keys: ${{ runner.os }}-konan-1.4.20
~/.konan/kotlin-native-prebuilt-macos-*
key: ${{ runner.os }}-konan
restore-keys: ${{ runner.os }}-konan
- name: Build with Gradle
run: sudo ./gradlew -Dorg.gradle.daemon=false --build-cache build
@ -84,18 +87,19 @@ jobs:
uses: actions/cache@v2
with:
path: |
**/.gradle
**/build
key: gradle_6_6_1
restore-keys: gradle_6_6_1
.gradle
build
~/.gradle
key: ${{ runner.os }}-gradle
restore-keys: ${{ runner.os }}-gradle
- name: Cache konan
uses: actions/cache@v2
with:
path: |
~/.konan/dependencies
~/.konan/kotlin-native-prebuilt-mingw-1.4.20
key: ${{ runner.os }}-konan-1.4.20
restore-keys: ${{ runner.os }}-konan-1.4.20
~/.konan/kotlin-native-prebuilt-mingw-*
key: ${{ runner.os }}-konan
restore-keys: ${{ runner.os }}-konan
- name: Build with Gradle
run: ./gradlew --build-cache build