From b292535ab603084b797610a13d21bf19ac98d1ce Mon Sep 17 00:00:00 2001 From: Ash Date: Tue, 10 May 2022 22:55:35 +0800 Subject: [PATCH] Update GitHub workflows --- .github/workflows/build_commit.yaml | 32 +++++++++++++---------- .github/workflows/build_pull_request.yaml | 32 +++++++++++++---------- 2 files changed, 36 insertions(+), 28 deletions(-) diff --git a/.github/workflows/build_commit.yaml b/.github/workflows/build_commit.yaml index 08e1596..b9228fc 100644 --- a/.github/workflows/build_commit.yaml +++ b/.github/workflows/build_commit.yaml @@ -2,19 +2,23 @@ name: "Build Commit" on: push jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 - with: - distribution: temurin - java-version: 11 + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v2 + with: + distribution: temurin + java-version: 11 - - uses: gradle/gradle-build-action@v2 - - run: gradle assembleRelease + - uses: gradle/gradle-build-action@v2 + - run: gradle assembleRelease - - uses: actions/upload-artifact@v3 - with: - name: ${{ github.sha }} - path: app/build/outputs/apk/release/*.apk \ No newline at end of file + - uses: actions/upload-artifact@v3 + with: + name: github-${{ github.sha }} + path: app/build/outputs/apk/github/release/*.apk + - uses: actions/upload-artifact@v3 + with: + name: fdroid-${{ github.sha }} + path: app/build/outputs/apk/fdroid/release/*.apk diff --git a/.github/workflows/build_pull_request.yaml b/.github/workflows/build_pull_request.yaml index e87bad9..b14da86 100644 --- a/.github/workflows/build_pull_request.yaml +++ b/.github/workflows/build_pull_request.yaml @@ -2,19 +2,23 @@ name: "Build Pull Request" on: pull_request jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 - with: - distribution: temurin - java-version: 11 + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v2 + with: + distribution: temurin + java-version: 11 - - uses: gradle/gradle-build-action@v2 - - run: gradle assembleRelease + - uses: gradle/gradle-build-action@v2 + - run: gradle assembleRelease - - uses: actions/upload-artifact@v3 - with: - name: ${{ github.sha }} - path: app/build/outputs/apk/release/*.apk \ No newline at end of file + - uses: actions/upload-artifact@v3 + with: + name: github-${{ github.sha }} + path: app/build/outputs/apk/github/release/*.apk + - uses: actions/upload-artifact@v3 + with: + name: fdroid-${{ github.sha }} + path: app/build/outputs/apk/fdroid/release/*.apk