diff --git a/.github/workflows/benchmark-apk.yml b/.github/workflows/benchmark-apk.yml index 6b7f2864..1c0b189e 100644 --- a/.github/workflows/benchmark-apk.yml +++ b/.github/workflows/benchmark-apk.yml @@ -20,16 +20,16 @@ jobs: steps: - name: Checkout source - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Set up JDK 21 - uses: actions/setup-java@v4 + uses: actions/setup-java@v6 with: distribution: 'temurin' java-version: 21 - name: Cache Gradle - uses: actions/cache@v4 + uses: actions/cache@v6 with: path: | ~/.gradle/caches @@ -59,7 +59,7 @@ jobs: BUILD_TOOLS_VERSION: "34.0.0" - name: Upload benchmark APK - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: amber-benchmark-${{ github.sha }} path: app/build/outputs/apk/benchmark/release/app-benchmark-universal-release-unsigned-signed.apk diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a08f1bc5..a756a6e1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,16 +15,16 @@ jobs: timeout-minutes: 30 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Set up JDK 21 - uses: actions/setup-java@v4 + uses: actions/setup-java@v6 with: distribution: 'temurin' java-version: 21 - name: Cache gradle - uses: actions/cache@v4 + uses: actions/cache@v6 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }} @@ -48,13 +48,13 @@ jobs: run: ./gradlew assembleDebug --no-daemon - name: Upload APK - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: Debug APK path: app/build/outputs/apk/free/debug/app-free-universal-debug.apk - name: Upload Test Results - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: Build Reports path: app/build/reports diff --git a/.github/workflows/check-offline-permissions.yml b/.github/workflows/check-offline-permissions.yml index 66b01263..2baac126 100644 --- a/.github/workflows/check-offline-permissions.yml +++ b/.github/workflows/check-offline-permissions.yml @@ -15,16 +15,16 @@ jobs: timeout-minutes: 20 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Set up JDK 21 - uses: actions/setup-java@v4 + uses: actions/setup-java@v6 with: distribution: 'temurin' java-version: 21 - name: Cache Gradle - uses: actions/cache@v4 + uses: actions/cache@v6 with: path: | ~/.gradle/caches diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 4c91401c..40c1f703 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -13,16 +13,16 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Set up JDK 21 - uses: actions/setup-java@v4 + uses: actions/setup-java@v6 with: distribution: 'temurin' java-version: 21 - name: Cache gradle - uses: actions/cache@v4 + uses: actions/cache@v6 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }} @@ -49,31 +49,23 @@ jobs: # override default build-tools version (29.0.3) -- optional BUILD_TOOLS_VERSION: "34.0.0" - - uses: kaisugi/action-regex-match@v1.0.1 + - uses: kaisugi/action-regex-match@v1.0.2 id: regex-match with: text: ${{ github.ref }} regex: '(v*-pre*)' flags: gm - - name: Create Release - id: create_release - uses: actions/create-release@v1 + - name: Rename APK for release asset + run: cp app/build/outputs/apk/free/release/app-free-universal-release-unsigned-signed.apk amber-fdroid-universal-${{ github.ref_name }}.apk + + - name: Create Release and Upload Asset + uses: softprops/action-gh-release@v3 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: tag_name: ${{ github.ref }} - release_name: Release ${{ github.ref }} + name: Release ${{ github.ref }} draft: false prerelease: ${{ steps.regex-match.outputs.match != '' }} - - - name: Upload Free APK Universal Asset - id: upload-free-release-asset-universal-apk - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/free/release/app-free-universal-release-unsigned-signed.apk - asset_name: amber-fdroid-universal-${{ github.ref_name }}.apk - asset_content_type: application/zip + files: amber-fdroid-universal-${{ github.ref_name }}.apk diff --git a/.github/workflows/unsigned-release.yml b/.github/workflows/unsigned-release.yml index 3dc1c4f1..e66cb1d7 100644 --- a/.github/workflows/unsigned-release.yml +++ b/.github/workflows/unsigned-release.yml @@ -14,16 +14,16 @@ jobs: steps: - name: Checkout source - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Set up JDK 21 - uses: actions/setup-java@v4 + uses: actions/setup-java@v6 with: distribution: 'temurin' java-version: 21 - name: Cache Gradle - uses: actions/cache@v4 + uses: actions/cache@v6 with: path: | ~/.gradle/caches @@ -43,7 +43,7 @@ jobs: ./gradlew bundleFreeRelease bundleOfflineRelease assembleFreeRelease assembleOfflineRelease --stacktrace - name: Upload all APKs as artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: All-APKs-${{ github.ref_name }} path: app/build/outputs/apk/**/release/*.apk