diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e3d4087..0f087e7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: build-abi: strategy: matrix: - abi: [arm64-v8a] + abi: [arm64-v8a, armeabi-v7a, x86_64, x86] fail-fast: true # If one ABI fails, cancel others — never publish partial runs-on: ubuntu-latest steps: @@ -90,8 +90,10 @@ jobs: - name: Stage .so files and TdApi.java run: | - mkdir -p core/src/main/jniLibs/arm64-v8a - cp downloaded_artifacts/arm64-v8a/libtdjni.so core/src/main/jniLibs/arm64-v8a/ + for ABI in arm64-v8a armeabi-v7a x86_64 x86; do + mkdir -p "core/src/main/jniLibs/$ABI" + cp "downloaded_artifacts/$ABI/libtdjni.so" "core/src/main/jniLibs/$ABI/" + done mkdir -p core/src/main/java/org/drinkless/tdlib cp downloaded_artifacts/java/org/drinkless/tdlib/TdApi.java core/src/main/java/org/drinkless/tdlib/ cp downloaded_artifacts/java/org/drinkless/tdlib/Client.java core/src/main/java/org/drinkless/tdlib/ || echo "Client.java not present - using template" @@ -121,7 +123,9 @@ jobs: - name: Compute checksums run: | sha256sum core/build/outputs/aar/core-release.aar > core-release.aar.sha256 - sha256sum core/src/main/jniLibs/arm64-v8a/libtdjni.so >> checksums.txt + for ABI in arm64-v8a armeabi-v7a x86_64 x86; do + sha256sum "core/src/main/jniLibs/$ABI/libtdjni.so" >> checksums.txt + done - name: Upload final AAR artifact uses: actions/upload-artifact@v4 diff --git a/.github/workflows/check-upstream.yml b/.github/workflows/check-upstream.yml index 56ae709..2419fc6 100644 --- a/.github/workflows/check-upstream.yml +++ b/.github/workflows/check-upstream.yml @@ -10,7 +10,6 @@ concurrency: jobs: check: - timeout-minutes: 30 runs-on: ubuntu-latest outputs: version_changed: ${{ steps.check.outputs.changed }} diff --git a/.github/workflows/cloud-emulator-test.yml b/.github/workflows/cloud-emulator-test.yml index ed77ef5..34551d3 100644 --- a/.github/workflows/cloud-emulator-test.yml +++ b/.github/workflows/cloud-emulator-test.yml @@ -8,7 +8,6 @@ concurrency: jobs: test: - timeout-minutes: 30 runs-on: ubuntu-latest strategy: matrix: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 507a787..1289d8a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,5 +1,8 @@ name: Publish to Maven Central on: + push: + branches: + - main pull_request: types: [closed] workflow_dispatch: # Allow manual release triggers @@ -10,9 +13,9 @@ concurrency: jobs: publish: - timeout-minutes: 30 if: | github.event_name == 'workflow_dispatch' || + (github.event_name == 'push' && github.ref == 'refs/heads/main') || (github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'version-bump')) runs-on: ubuntu-latest outputs: diff --git a/.github/workflows/rotate-reminder.yml b/.github/workflows/rotate-reminder.yml index c193d01..85cff9d 100644 --- a/.github/workflows/rotate-reminder.yml +++ b/.github/workflows/rotate-reminder.yml @@ -10,7 +10,6 @@ concurrency: jobs: remind: - timeout-minutes: 30 runs-on: ubuntu-latest steps: - name: Open rotation reminder issue diff --git a/.github/workflows/smoke-test-publish.yml b/.github/workflows/smoke-test-publish.yml index 1b9bfb0..f9226fa 100644 --- a/.github/workflows/smoke-test-publish.yml +++ b/.github/workflows/smoke-test-publish.yml @@ -17,7 +17,6 @@ concurrency: jobs: smoke-test: - timeout-minutes: 30 runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/VERSION b/VERSION index 49d5957..6e8bf73 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1 +0.1.0 diff --git a/scripts/verify-abi-count.sh b/scripts/verify-abi-count.sh index 9c06c9a..81d8ff4 100755 --- a/scripts/verify-abi-count.sh +++ b/scripts/verify-abi-count.sh @@ -10,6 +10,9 @@ FAILED=0 declare -A EXPECTED_ARCHS EXPECTED_ARCHS=( ["arm64-v8a"]="AArch64" + ["armeabi-v7a"]="ARM" + ["x86_64"]="X86-64" + ["x86"]="80386" ) for ABI in "${!EXPECTED_ARCHS[@]}"; do