From 534f6aa22ca3f3b4b447520ee299cd20fe06a899 Mon Sep 17 00:00:00 2001 From: FooIbar <118464521+FooIbar@users.noreply.github.com> Date: Sat, 23 Sep 2023 19:13:43 +0800 Subject: [PATCH] Merge pull request workflow to CI --- .github/workflows/ci.yml | 5 ++- .github/workflows/pull_request.yml | 66 ------------------------------ 2 files changed, 4 insertions(+), 67 deletions(-) delete mode 100644 .github/workflows/pull_request.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 66c6a1ace..e047c35fa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,10 @@ name: CI on: push: branches: - - '**' + - '*' + - 'renovate/**' + pull_request: + workflow_dispatch: jobs: linux: diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml deleted file mode 100644 index 64705f013..000000000 --- a/.github/workflows/pull_request.yml +++ /dev/null @@ -1,66 +0,0 @@ -name: Pull Request Check - -on: [ pull_request ] - -jobs: - linux: - name: Build - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 - with: - submodules: 'recursive' - - - name: Setup Java 17 - uses: actions/setup-java@v3 - with: - distribution: temurin - java-version: 17 - - - name: Install NDK - run: | - echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;26.0.10636728" --channel=1 --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null - - - name: Install Rust Toolchain - run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android && rustup component add rustfmt clippy - - - name: Rustfmt Check - working-directory: ./app/src/main/rust - run: cargo fmt --all -- --check - - - name: Clippy Check - working-directory: ./app/src/main/rust - run: cargo clippy --all-targets --all-features -- -D warnings - - - name: Ktlint Check - run: ./gradlew ktlintCheck - - - name: Gradle Build - uses: gradle/gradle-build-action@v2 - with: - arguments: assembleRelease - - - name: Update ARM64 - uses: actions/upload-artifact@v3 - with: - name: arm64-v8a-${{ github.sha }} - path: app/build/outputs/apk/release/app-arm64-v8a-release.apk - - - name: Update x86_64 - uses: actions/upload-artifact@v3 - with: - name: x86_64-${{ github.sha }} - path: app/build/outputs/apk/release/app-x86_64-release.apk - - - name: Update ARM32 - uses: actions/upload-artifact@v3 - with: - name: armeabi-v7a-${{ github.sha }} - path: app/build/outputs/apk/release/app-armeabi-v7a-release.apk - - - name: Update x86 - uses: actions/upload-artifact@v3 - with: - name: x86-${{ github.sha }} - path: app/build/outputs/apk/release/app-x86-release.apk