From da6b276f4debd080f4a41cd44b2a0a2ecda5f575 Mon Sep 17 00:00:00 2001 From: LoveSy Date: Wed, 5 Jun 2024 10:34:30 +0800 Subject: [PATCH] Update actions --- .github/workflows/build.yml | 12 ++++++++++++ .github/workflows/maven.yml | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c55c096..fad4db8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,11 +32,19 @@ jobs: cache: 'gradle' - name: Setup Android SDK uses: android-actions/setup-android@v3 + - uses: seanmiddleditch/gha-setup-ninja@master + with: + version: 1.12.0 + - name: Setup Android SDK + uses: android-actions/setup-android@v3 - name: ccache uses: hendrikmuhs/ccache-action@v1 with: key: ${{ runner.os }}-${{ github.sha }} restore-keys: ${{ runner.os }} + - name: Remove Android's cmake + shell: bash + run: rm -rf $ANDROID_HOME/cmake - name: Build with Gradle run: | ccache -o cache_dir=${{ github.workspace }}/.ccache @@ -161,6 +169,9 @@ jobs: cache: 'gradle' - name: Setup Android SDK uses: android-actions/setup-android@v3 + - uses: seanmiddleditch/gha-setup-ninja@master + with: + version: 1.12.0 - name: ccache uses: hendrikmuhs/ccache-action@v1 with: @@ -179,6 +190,7 @@ jobs: arch: ${{ matrix.arch }} target: ${{ matrix.target }} script: | + rm -rf $ANDROID_HOME/cmake ccache -o cache_dir=${{ github.workspace }}/.ccache ccache -o hash_dir=false ccache -o compiler_check='%compiler% -dumpmachine; %compiler% -dumpversion' diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 5765503..e1c0b51 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -22,8 +22,15 @@ jobs: cache: 'gradle' - name: Setup Android SDK uses: android-actions/setup-android@v3 + - name: Setup Android SDK + uses: android-actions/setup-android@v3 + - uses: seanmiddleditch/gha-setup-ninja@master + with: + version: 1.12.0 - name: Build with Gradle - run: ./gradlew :lsplant:publish + run: | + rm -rf $ANDROID_HOME/cmake + ./gradlew :lsplant:publish env: ORG_GRADLE_PROJECT_signingKey: ${{ secrets.maven_pgp_signingKey }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.maven_pgp_signingPassword }}