Merge pull request shadowsocks#3230 from shadowsocks/bump-version-5.3.5

Bump version to 5.3.5-nightly

Author: madeye

.github/workflows/e2e-test.yml

@@ -0,0 +1,81 @@
+name: E2E Test
+on:
+  push:
+    branches: [master]
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  e2e-test:
+    runs-on: ubuntu-latest
+    timeout-minutes: 45
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: jetbrains
+          java-version: 21
+
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: x86_64-linux-android
+
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' \
+            | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: Gradle cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: gradle-${{ hashFiles('**/*.gradle*', 'gradle/wrapper/gradle-wrapper.properties') }}
+
+      - name: Cargo cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            core/src/main/rust/shadowsocks-rust/target
+          key: cargo-${{ hashFiles('core/src/main/rust/shadowsocks-rust/Cargo.lock') }}
+
+      - name: Build debug APK (x86_64)
+        run: ./gradlew assembleDebug -PCARGO_PROFILE=debug -PTARGET_ABI=x86_64
+
+      - name: Build ssserver
+        run: |
+          cd core/src/main/rust/shadowsocks-rust
+          cargo build --release --bin ssserver --features "server,aead-cipher,logging"
+
+      - name: E2E Test
+        uses: ReactiveCircus/android-emulator-runner@v2
+        with:
+          api-level: 34
+          target: google_apis
+          arch: x86_64
+          force-avd-creation: true
+          emulator-options: >-
+            -no-snapshot-save -no-window -gpu swiftshader_indirect
+            -noaudio -no-boot-anim
+          disable-animations: true
+          script: bash test-e2e.sh
+        env:
+          SKIP_EMULATOR_BOOT: "true"
+          ADB: adb
+          APK: ${{ github.workspace }}/mobile/build/outputs/apk/debug/mobile-x86_64-debug.apk
+          SSSERVER: ${{ github.workspace }}/core/src/main/rust/shadowsocks-rust/target/release/ssserver
+
+      - name: Upload screenshots
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: e2e-screenshots
+          path: screen_*.png

buildSrc/src/main/kotlin/Helpers.kt

@@ -48,8 +48,8 @@ fun Project.setupCore() {
     setupCommon()
     android.apply {
         defaultConfig {
-            versionCode = 5030450
-            versionName = "5.3.4-nightly"
+            versionCode = 5030550
+            versionName = "5.3.5-nightly"
         }
         compileOptions.isCoreLibraryDesugaringEnabled = true
         lint.apply {

core/build.gradle.kts

@@ -10,14 +10,18 @@ plugins {
 
 setupCore()
 
+val allAbis = mapOf("arm" to "armeabi-v7a", "arm64" to "arm64-v8a", "x86" to "x86", "x86_64" to "x86_64")
+val targetAbi = findProperty("TARGET_ABI")?.toString()
+
 android {
     namespace = "com.github.shadowsocks.core"
 
     defaultConfig {
         consumerProguardFiles("proguard-rules.pro")
 
         externalNativeBuild.ndkBuild {
-            abiFilters("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
+            val abis = if (targetAbi != null) listOf(allAbis.getValue(targetAbi)) else allAbis.values.toList()
+            abiFilters(*abis.toTypedArray())
             arguments("-j${Runtime.getRuntime().availableProcessors()}")
         }
 
@@ -39,7 +43,7 @@ android {
 cargo {
     module = "src/main/rust/shadowsocks-rust"
     libname = "sslocal"
-    targets = listOf("arm", "arm64", "x86", "x86_64")
+    targets = if (targetAbi != null) listOf(targetAbi) else listOf("arm", "arm64", "x86", "x86_64")
     profile = findProperty("CARGO_PROFILE")?.toString() ?: currentFlavor
     extraCargoBuildArguments = listOf("--bin", libname!!)
     featureSpec.noDefaultBut(arrayOf(