diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7638b198..61070375 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,12 +2,8 @@ name: Build APK on: push: - workflow_dispatch: - inputs: - XRAY_CORE_VERSION: - description: 'Xray core version or commit hash' - required: false - + branches: + - master jobs: build: @@ -26,7 +22,7 @@ jobs: - name: Setup Golang uses: actions/setup-go@v5 with: - go-version: '1.23.2' + go-version: '1.23.4' cache: false - name: Patch Go use 600296 @@ -49,45 +45,41 @@ jobs: cd ${{ github.workspace }}/build git clone --depth=1 -b main https://github.com/2dust/AndroidLibXrayLite.git cd AndroidLibXrayLite - go get github.com/xtls/xray-core@${{ github.event.inputs.XRAY_CORE_VERSION }} || true gomobile init go mod tidy -v gomobile bind -v -androidapi 21 -ldflags='-s -w' ./ cp *.aar ${{ github.workspace }}/V2rayNG/app/libs/ + - name: Decode Keystore + uses: timheuer/base64-to-file@v1 + id: android_keystore + with: + fileName: "android_keystore.jks" + encodedString: ${{ secrets.APP_KEYSTORE_BASE64 }} + - name: Build APK run: | cd ${{ github.workspace }}/V2rayNG chmod 755 gradlew - ./gradlew assembleDebug + ./gradlew assembleRelease -Pandroid.injected.signing.store.file=${{ steps.android_keystore.outputs.filePath }} -Pandroid.injected.signing.store.password=${{ secrets.APP_KEYSTORE_PASSWORD }} -Pandroid.injected.signing.key.alias=${{ secrets.APP_KEYSTORE_ALIAS }} -Pandroid.injected.signing.key.password=${{ secrets.APP_KEY_PASSWORD }} - name: Upload arm64-v8a APK uses: actions/upload-artifact@v4 if: ${{ success() }} with: name: arm64-v8a - path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug/*arm64-v8a*.apk + path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/release/*arm64-v8a*.apk - name: Upload armeabi-v7a APK uses: actions/upload-artifact@v4 if: ${{ success() }} with: name: armeabi-v7a - path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug/*armeabi-v7a*.apk + path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/release/*armeabi-v7a*.apk - name: Upload x86 APK uses: actions/upload-artifact@v4 if: ${{ success() }} with: name: x86-apk - path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug/*x86*.apk - - - name: Upload Other APKs - uses: actions/upload-artifact@v4 - with: - name: others-apk - path: | - ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug - !${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug/*arm64-v8a*.apk - !${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug/*armeabi-v7a*.apk - !${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug/*x86*.apk + path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/release/*x86*.apk \ No newline at end of file