Skip to content

Commit 409d5b1

Browse files
committed
ci: revert the keys to the way they used to be defined because the runner context is not available in the top-level env block
1 parent ac806ce commit 409d5b1

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

.github/workflows/android.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ name: Android CI
22

33
on: [ push ]
44

5-
env:
6-
GRADLE_WRAPPER_CACHE_KEY: ${{ runner.OS }}-gradle-wrapper-cache-${{ hashFiles('build.gradle.kts', 'settings.gradle.kts', 'gradle/wrapper/gradle-wrapper.properties', 'gradle/libs.versions.toml') }}
7-
GRADLE_CACHES_CACHE_KEY: ${{ runner.OS }}-gradle-caches-cache-${{ hashFiles('build.gradle.kts', 'settings.gradle.kts', 'gradle/libs.versions.toml') }}
8-
95
jobs:
106

117
unit-test:
@@ -25,14 +21,14 @@ jobs:
2521
uses: actions/cache@v3
2622
with:
2723
path: ~/.gradle/wrapper
28-
key: ${{ env.GRADLE_WRAPPER_CACHE_KEY }}
24+
key: ${{ runner.OS }}-gradle-wrapper-cache-${{ hashFiles('build.gradle.kts', 'settings.gradle.kts', 'gradle/wrapper/gradle-wrapper.properties', 'gradle/libs.versions.toml') }}
2925
restore-keys: |
3026
${{ runner.OS }}-gradle-wrapper-cache-
3127
- name: Cache Gradle caches
3228
uses: actions/cache@v3
3329
with:
3430
path: ~/.gradle/caches
35-
key: ${{ env.GRADLE_CACHES_CACHE_KEY }}
31+
key: ${{ runner.OS }}-gradle-caches-cache-${{ hashFiles('build.gradle.kts', 'settings.gradle.kts', 'gradle/libs.versions.toml') }}
3632
restore-keys: |
3733
${{ runner.OS }}-gradle-caches-cache-
3834
- name: generate ksProp file
@@ -64,14 +60,14 @@ jobs:
6460
uses: actions/cache@v3
6561
with:
6662
path: ~/.gradle/wrapper
67-
key: ${{ env.GRADLE_WRAPPER_CACHE_KEY }}
63+
key: ${{ runner.OS }}-gradle-wrapper-cache-${{ hashFiles('build.gradle.kts', 'settings.gradle.kts', 'gradle/wrapper/gradle-wrapper.properties', 'gradle/libs.versions.toml') }}
6864
restore-keys: |
6965
${{ runner.OS }}-gradle-wrapper-cache-
7066
- name: Cache Gradle caches
7167
uses: actions/cache@v3
7268
with:
7369
path: ~/.gradle/caches
74-
key: ${{ env.GRADLE_CACHES_CACHE_KEY }}
70+
key: ${{ runner.OS }}-gradle-caches-cache-${{ hashFiles('build.gradle.kts', 'settings.gradle.kts', 'gradle/libs.versions.toml') }}
7571
restore-keys: |
7672
${{ runner.OS }}-gradle-caches-cache-
7773
- name: generate ksProp file
@@ -102,14 +98,14 @@ jobs:
10298
uses: actions/cache@v3
10399
with:
104100
path: ~/.gradle/wrapper
105-
key: ${{ env.GRADLE_WRAPPER_CACHE_KEY }}
101+
key: ${{ runner.OS }}-gradle-wrapper-cache-${{ hashFiles('build.gradle.kts', 'settings.gradle.kts', 'gradle/wrapper/gradle-wrapper.properties', 'gradle/libs.versions.toml') }}
106102
restore-keys: |
107103
${{ runner.OS }}-gradle-wrapper-cache-
108104
- name: Cache Gradle caches
109105
uses: actions/cache@v3
110106
with:
111107
path: ~/.gradle/caches
112-
key: ${{ env.GRADLE_CACHES_CACHE_KEY }}
108+
key: ${{ runner.OS }}-gradle-caches-cache-${{ hashFiles('build.gradle.kts', 'settings.gradle.kts', 'gradle/libs.versions.toml') }}
113109
restore-keys: |
114110
${{ runner.OS }}-gradle-caches-cache-
115111
- name: generate ksProp file

0 commit comments

Comments
 (0)