diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1620320..50b9c1f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -138,28 +138,23 @@ jobs: with: distribution: 'temurin' java-version: '17' - cache: gradle - - name: 📦 Restore Gradle cache (master-first) - id: gradle-cache + - name: 📦 Restore Gradle cache uses: actions/cache/restore@v6 with: path: | ~/.gradle/caches ~/.gradle/wrapper - key: gradle-${{ runner.os }}-${{ github.ref_name }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', '**/gradle/libs.versions.toml') }} - restore-keys: | - gradle-${{ runner.os }}-master- - gradle-${{ runner.os }}- + key: setup-java-${{ runner.os }}-gradle - - name: 💾 Save Gradle cache (only master / on miss) - if: github.ref_name == 'master' || steps.gradle-cache.outputs.cache-hit != 'true' + - name: 💾 Save Gradle cache + if: success() uses: actions/cache/save@v5 with: path: | ~/.gradle/caches ~/.gradle/wrapper - key: ${{ steps.gradle-cache.outputs.cache-primary-key }} + key: setup-java-${{ runner.os }}-gradle - name: 🔧 Grant execute permission to gradlew run: chmod +x ./gradlew @@ -228,26 +223,22 @@ jobs: distribution: 'temurin' java-version: '17' - - name: 🐘 Restore Gradle cache (shared, master-first) - id: gradle-cache + - name: 🐘 Restore Gradle cache uses: actions/cache/restore@v6 with: path: | ~/.gradle/caches ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ github.ref_name }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', '**/gradle/libs.versions.toml') }} - restore-keys: | - ${{ runner.os }}-gradle-master- - ${{ runner.os }}-gradle- + key: setup-java-${{ runner.os }}-gradle - - name: 💾 Save Gradle cache (only master / on miss) - if: github.ref_name == 'master' || steps.gradle-cache.outputs.cache-hit != 'true' + - name: 💾 Save Gradle cache + if: success() uses: actions/cache/save@v5 with: path: | ~/.gradle/caches ~/.gradle/wrapper - key: ${{ steps.gradle-cache.outputs.cache-primary-key }} + key: setup-java-${{ runner.os }}-gradle - name: 📱 Restore AVD cache (1 per API, master-first) id: avd-cache diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bd5bd7c..c3cf4a8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -132,28 +132,23 @@ jobs: with: distribution: 'temurin' java-version: '17' - cache: gradle - - name: 📦 Restore Gradle cache (master-first) - id: gradle-cache + - name: 📦 Restore Gradle cache uses: actions/cache/restore@v6 with: path: | ~/.gradle/caches ~/.gradle/wrapper - key: gradle-${{ runner.os }}-${{ github.ref_name }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', '**/gradle/libs.versions.toml') }} - restore-keys: | - gradle-${{ runner.os }}-master- - gradle-${{ runner.os }}- + key: setup-java-${{ runner.os }}-gradle - - name: 💾 Save Gradle cache (only master / on miss) - if: github.ref_name == 'master' || steps.gradle-cache.outputs.cache-hit != 'true' + - name: 💾 Save Gradle cache + if: success() uses: actions/cache/save@v5 with: path: | ~/.gradle/caches ~/.gradle/wrapper - key: ${{ steps.gradle-cache.outputs.cache-primary-key }} + key: setup-java-${{ runner.os }}-gradle - name: 🔧 Grant execute permission to gradlew run: chmod +x ./gradlew @@ -521,6 +516,7 @@ jobs: --arg run_url "$RUN_URL" \ --argjson color "$COLOR" \ --arg status "$STATUS" \ + --arg branch "$BRANCH" \ --arg short_sha "$SHORT_SHA" \ --arg author "$AUTHOR" \ --arg event "$EVENT" \ diff --git a/build.gradle.kts b/build.gradle.kts index 9d9b434..bc03463 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,4 +5,4 @@ plugins { alias(libs.plugins.android.library) apply false } -version = "0.1.1" +version = "0.1.11"