diff --git a/.commitlintrc.yml b/.commitlintrc.yml index ec698d7c6..0802f0683 100644 --- a/.commitlintrc.yml +++ b/.commitlintrc.yml @@ -5,4 +5,5 @@ rules: #允许中文 subject-case: [ 0 ] footer-max-line-length: [ 0 ] + body-max-line-length: [ 0 ] helpUrl: https://www.conventionalcommits.org/zh-hans/v1.0.0/ diff --git a/.github/actions/post-build/action.yml b/.github/actions/post-build/action.yml new file mode 100644 index 000000000..559fb63d1 --- /dev/null +++ b/.github/actions/post-build/action.yml @@ -0,0 +1,8 @@ +name: post-build +description: '清理构建环境' +runs: + using: "composite" + steps: + - name: stop gradle deamon for actions/cache + shell: bash + run: ./gradlew --stop diff --git a/.github/actions/pre-build/action.yml b/.github/actions/pre-build/action.yml new file mode 100644 index 000000000..04f3b459a --- /dev/null +++ b/.github/actions/pre-build/action.yml @@ -0,0 +1,18 @@ +name: pre-build +description: '准备构建环境' +runs: + using: "composite" + steps: + - name: revert gradle distributionUrl in every gradle-wrapper.properties + shell: bash + run: git grep -l 'mirrors.tencent.com/gradle' -- gradle-wrapper.properties '**/gradle-wrapper.properties' | xargs sed -i 's/mirrors.tencent.com\/gradle/services.gradle.org\/distributions/g' + - name: Inject slug/short variables + uses: rlespinasse/github-slug-action@v3.x + - name: revert gradle wrapper mirror setting + shell: bash + run: echo "DISABLE_TENCENT_MAVEN_MIRROR=true" >> $GITHUB_ENV + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '17' + cache: 'gradle' diff --git a/.github/workflows/check-build-test.yml b/.github/workflows/check-build-test.yml new file mode 100644 index 000000000..5e49b2833 --- /dev/null +++ b/.github/workflows/check-build-test.yml @@ -0,0 +1,177 @@ +name: Check & Build & Test +on: + workflow_call: + push: + branches: + - master + pull_request: + branches: [ master ] + +jobs: + check-commit-message: + name: 提交日志格式化检查 + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - uses: wagoid/commitlint-github-action@v6 + with: + configFile: ./.commitlintrc.yml + check-code-format: + name: 代码格式化检查 + runs-on: ubuntu-latest + env: + AndroidStudioVersion: 2021.1.1.20 + steps: + - name: checkout + uses: actions/checkout@v4 + - name: Cache android-studio + id: cache-android-studio + uses: actions/cache@v4 + with: + path: android-studio + key: ${{ runner.os }}-android-studio--${{ env.AndroidStudioVersion }} + - name: download android-studio + if: steps.cache-android-studio.outputs.cache-hit != 'true' + run: | + wget "https://redirector.gvt1.com/edgedl/android/studio/ide-zips/$AndroidStudioVersion/android-studio-$AndroidStudioVersion-linux.tar.gz" + tar -xvzf "android-studio-$AndroidStudioVersion-linux.tar.gz" + rm -rf "android-studio-$AndroidStudioVersion-linux.tar.gz" + - name: use android-studio format all files + run: ./android-studio/bin/format.sh -s .idea/codeStyles/Project.xml -r -m \*.java,\*.kt,\*.xml . + - name: show diff for files not formated + run: | + if ! git diff --quiet; then + git diff --exit-code + fi + build-sdk: + needs: [ check-commit-message, check-code-format ] + name: 构建SDK + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@v4 + - name: pre-build + uses: ./.github/actions/pre-build + - name: buildSdk + run: ./gradlew buildSdk -S + - name: post-build + uses: ./.github/actions/post-build + build-sample-maven: + needs: [ check-commit-message, check-code-format ] + name: 构建maven依赖SDK的sample + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@v4 + - name: pre-build + uses: ./.github/actions/pre-build + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '11' + cache: 'gradle' + - name: build sample/maven/host-project + working-directory: projects/sample/maven/host-project + run: ./gradlew assemble + - name: build sample/maven/manager-project + working-directory: projects/sample/maven/manager-project + run: ./gradlew assemble + - name: build sample/maven/plugin-project + working-directory: projects/sample/maven/plugin-project + run: ./gradlew assemble + - name: post-build + uses: ./.github/actions/post-build + build-all: + needs: build-sdk + name: 构建所有源码 + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@v4 + - name: pre-build + uses: ./.github/actions/pre-build + - name: buildSdk + run: ./gradlew build + - name: post-build + uses: ./.github/actions/post-build + test-agp-compatibility: + needs: build-sdk + name: AGP兼容性自动化测试 + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@v4 + - name: pre-build + uses: ./.github/actions/pre-build + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '17' + cache: 'gradle' + - name: JDK17环境下AGP测试 + working-directory: projects/test/gradle-plugin-agp-compat-test + run: ./test_JDK17.sh + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '11' + cache: 'gradle' + - name: JDK11环境下AGP测试 + working-directory: projects/test/gradle-plugin-agp-compat-test + run: ./test_JDK11.sh + - name: post-build + uses: ./.github/actions/post-build + test-sdk-jvm: + needs: build-sdk + name: 自动化测试-JVM部分 + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@v4 + - name: pre-build + uses: ./.github/actions/pre-build + - name: jvmTestSdk + run: ./gradlew jvmTestSdk -S + - name: post-build + uses: ./.github/actions/post-build + test-sdk-avd: + needs: build-sdk + name: 自动化测试-AVD部分 + runs-on: ubuntu-latest + strategy: + matrix: + include: + - api-level: 16 #16是最低支持的API + arch: x86 + target: default + - api-level: 28 #28是项目长期使用的测试API + arch: x86 + target: default + - api-level: 34 + arch: x86_64 + target: google_apis + steps: + - name: checkout + uses: actions/checkout@v4 + - name: pre-build + uses: ./.github/actions/pre-build + - 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: run AVD tests + uses: reactivecircus/android-emulator-runner@v2 + with: + api-level: ${{ matrix.api-level }} + target: ${{ matrix.target }} + arch: ${{ matrix.arch }} + profile: pixel_xl + force-avd-creation: false + emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none + disable-animations: true + script: ./gradlew androidTestSdk + - name: post-build + uses: ./.github/actions/post-build diff --git a/.github/workflows/pr-check-format-code.yml b/.github/workflows/pr-check-format-code.yml deleted file mode 100644 index eee4732aa..000000000 --- a/.github/workflows/pr-check-format-code.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: pr-check-format-code - -on: - pull_request: - branches: [ master ] - -jobs: - check-format-code: - runs-on: ubuntu-latest - steps: - - name: checkout - uses: actions/checkout@v2 - - name: Cache android-studio - id: cache-android-studio - uses: actions/cache@v2 - with: - path: android-studio - key: ${{ runner.os }}-android-studio - - name: download android-studio - if: steps.cache-android-studio.outputs.cache-hit != 'true' - run: | - wget https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2021.1.1.20/android-studio-2021.1.1.20-linux.tar.gz - tar -xvzf android-studio-2021.1.1.20-linux.tar.gz - rm -rf android-studio-2021.1.1.20-linux.tar.gz - - name: use android-studio format all files - run: ./android-studio/bin/format.sh -s .idea/codeStyles/Project.xml -r -m \*.java,\*.kt,\*.xml . - - name: show diff for files not formated - run: | - if ! git diff --quiet; then - git diff --exit-code - fi diff --git a/.github/workflows/pr-check-gradle-plugin.yml b/.github/workflows/pr-check-gradle-plugin.yml deleted file mode 100644 index 886992c9b..000000000 --- a/.github/workflows/pr-check-gradle-plugin.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: gradle-plugin-agp-compat-test - -on: - pull_request: - branches: [ master ] - paths: - - 'projects/sdk/core/gradle-plugin/**' - - 'projects/sdk/core/manifest-parser/**' - - 'projects/sdk/core/transform/**' - - 'projects/sdk/core/transform-kit/**' - - 'projects/sdk/coding/**' - - 'projects/test/gradle-plugin-agp-compat-test/**' - -jobs: - gradle-plugin-agp-compat-test: - runs-on: ubuntu-latest - env: - DISABLE_TENCENT_MAVEN_MIRROR: true - steps: - - name: Inject slug/short variables - uses: rlespinasse/github-slug-action@v3.x - - name: checkout - uses: actions/checkout@v2 - - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - - name: revert gradle wrapper mirror setting - run: echo 'distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip' > gradle/wrapper/gradle-wrapper.properties - - name: revert gradle wrapper mirror setting - working-directory: projects/test/gradle-plugin-agp-compat-test - run: echo 'distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip' > gradle/wrapper/gradle-wrapper.properties - - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: '17' - cache: 'gradle' - - name: test AGP compatibility when core.gradle-plugin changed with JDK17 - working-directory: projects/test/gradle-plugin-agp-compat-test - run: ./test_JDK17.sh - - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: '11' - cache: 'gradle' - - name: test AGP compatibility when core.gradle-plugin changed with JDK11 - working-directory: projects/test/gradle-plugin-agp-compat-test - run: ./test_JDK11.sh - - - name: stop gradle deamon for actions/cache - run: ./gradlew --stop diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml deleted file mode 100644 index e3416e84f..000000000 --- a/.github/workflows/pr-check.yml +++ /dev/null @@ -1,126 +0,0 @@ -name: PR Check - -on: - pull_request: - branches: [ master ] - -jobs: - build-and-test-on-macos: - runs-on: macos-latest - strategy: - matrix: - include: - - api-level: 16 #16是最低支持的API - arch: x86 - - api-level: 28 #28是项目长期使用的测试API - arch: x86_64 - - api-level: 31 #31是目前最新的稳定API - arch: x86_64 - env: - DISABLE_TENCENT_MAVEN_MIRROR: true - steps: - - name: Inject slug/short variables - uses: rlespinasse/github-slug-action@v3.x - - name: checkout - uses: actions/checkout@v2 - - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: '17' - cache: 'gradle' - - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - - name: revert gradle wrapper mirror setting - run: echo 'distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip' > gradle/wrapper/gradle-wrapper.properties - - name: buildSdk - run: ./gradlew buildSdk -S - - name: build sample/source - run: ./gradlew build - - name: unit test - run: ./gradlew jvmTestSdk -S - - name: run androidTestSdk - uses: reactivecircus/android-emulator-runner@v2 - with: - api-level: ${{ matrix.api-level }} - emulator-build: 8420304 - target: default - arch: ${{ matrix.arch }} - profile: pixel_xl - script: ./gradlew androidTestSdk - - name: stop gradle deamon for actions/cache - run: ./gradlew --stop - build-on-windows: - runs-on: windows-latest - env: - DISABLE_TENCENT_MAVEN_MIRROR: true - steps: - - name: Inject slug/short variables - uses: rlespinasse/github-slug-action@v3.x - - name: checkout - uses: actions/checkout@v2 - - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: '17' - cache: 'gradle' - - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - - name: revert gradle wrapper mirror setting - run: echo 'distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip' > gradle/wrapper/gradle-wrapper.properties - - name: buildSdk - run: ./gradlew buildSdk -S - - name: build sample/source - run: ./gradlew build - - name: stop gradle deamon for actions/cache - run: ./gradlew --stop - build-samples: - runs-on: ubuntu-latest - env: - DISABLE_TENCENT_MAVEN_MIRROR: true - steps: - - name: Inject slug/short variables - uses: rlespinasse/github-slug-action@v3.x - - name: checkout - uses: actions/checkout@v2 - - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - - name: revert gradle wrapper mirror setting - run: echo 'distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip' > gradle/wrapper/gradle-wrapper.properties - - name: revert gradle wrapper mirror setting for sample host-project - working-directory: projects/sample/maven/host-project - run: echo 'distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip' > gradle/wrapper/gradle-wrapper.properties - - name: revert gradle wrapper mirror setting for sample manager-project - working-directory: projects/sample/maven/manager-project - run: echo 'distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip' > gradle/wrapper/gradle-wrapper.properties - - name: revert gradle wrapper mirror setting for sample plugin-project - working-directory: projects/sample/maven/plugin-project - run: echo 'distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip' > gradle/wrapper/gradle-wrapper.properties - - name: build sample/maven/host-project - working-directory: projects/sample/maven/host-project - run: ./gradlew assemble - - name: build sample/maven/manager-project - working-directory: projects/sample/maven/manager-project - run: ./gradlew assemble - - name: build sample/maven/plugin-project - working-directory: projects/sample/maven/plugin-project - run: ./gradlew assemble - - name: stop gradle deamon for actions/cache - run: ./gradlew --stop diff --git a/.github/workflows/pr-commitlint.yml b/.github/workflows/pr-commitlint.yml deleted file mode 100644 index b8152dcf3..000000000 --- a/.github/workflows/pr-commitlint.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: Lint Commit Messages -on: [ pull_request ] - -jobs: - commitlint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - uses: wagoid/commitlint-github-action@v4 - with: - configFile: ./.commitlintrc.yml \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bb48c4ff0..98ace7ca5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,75 +6,19 @@ on: - published #https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#release jobs: - build-and-test: - runs-on: macos-latest - env: - DISABLE_TENCENT_MAVEN_MIRROR: true - steps: - - name: Inject slug/short variables - uses: rlespinasse/github-slug-action@v3.x - - name: checkout - uses: actions/checkout@v2 - - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: '17' - cache: 'gradle' - - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - - name: revert gradle wrapper mirror setting - run: echo 'distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip' > gradle/wrapper/gradle-wrapper.properties - - name: buildSdk - run: ./gradlew buildSdk - - name: build sample/source - run: ./gradlew build - - name: unit test - run: ./gradlew jvmTestSdk -S - - name: run androidTestSdk on API 28 emulator - uses: reactivecircus/android-emulator-runner@v2 - with: - api-level: 28 - emulator-build: 8420304 - target: default - arch: x86_64 - profile: pixel_xl - script: ./gradlew androidTestSdk - - name: stop gradle deamon for actions/cache - run: ./gradlew --stop publish: - needs: build-and-test - runs-on: macos-latest + needs: check-build-test + runs-on: ubuntu-latest env: DISABLE_TENCENT_MAVEN_MIRROR: true PUBLISH_RELEASE: true GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - - name: Inject slug/short variables - uses: rlespinasse/github-slug-action@v3.x - name: checkout - uses: actions/checkout@v2 - - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: '17' - cache: 'gradle' - - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - - name: revert gradle wrapper mirror setting - run: echo 'distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip' > gradle/wrapper/gradle-wrapper.properties + uses: actions/checkout@v4 + - name: pre-build + uses: ./.github/actions/pre-build - name: publish run: ./gradlew publish - - name: stop gradle deamon for actions/cache - run: ./gradlew --stop + - name: post-build + uses: ./.github/actions/post-build diff --git a/.github/workflows/test-avd-16.yml b/.github/workflows/test-avd-16.yml deleted file mode 100644 index 252f1afb0..000000000 --- a/.github/workflows/test-avd-16.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: daily-test-avd-16 - -on: - push: - branches: [ test-all-avd ] - -jobs: - job1: - uses: ./.github/workflows/test-avd.yml - with: - api-level: 16 - arch: x86 diff --git a/.github/workflows/test-avd-17.yml b/.github/workflows/test-avd-17.yml deleted file mode 100644 index 9289d70fe..000000000 --- a/.github/workflows/test-avd-17.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: daily-test-avd-17 - -on: - push: - branches: [ test-all-avd ] - -jobs: - job1: - uses: ./.github/workflows/test-avd.yml - with: - api-level: 17 - arch: x86 diff --git a/.github/workflows/test-avd-18.yml b/.github/workflows/test-avd-18.yml deleted file mode 100644 index a1d59807b..000000000 --- a/.github/workflows/test-avd-18.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: daily-test-avd-18 - -on: - push: - branches: [ test-all-avd ] - -jobs: - job1: - uses: ./.github/workflows/test-avd.yml - with: - api-level: 18 - arch: x86 diff --git a/.github/workflows/test-avd-19.yml b/.github/workflows/test-avd-19.yml deleted file mode 100644 index a719d693a..000000000 --- a/.github/workflows/test-avd-19.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: daily-test-avd-19 - -on: - push: - branches: [ test-all-avd ] - -jobs: - job1: - uses: ./.github/workflows/test-avd.yml - with: - api-level: 19 - arch: x86 diff --git a/.github/workflows/test-avd-21.yml b/.github/workflows/test-avd-21.yml deleted file mode 100644 index f51654cd7..000000000 --- a/.github/workflows/test-avd-21.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: daily-test-avd-21 - -on: - push: - branches: [ test-all-avd ] - -jobs: - job1: - uses: ./.github/workflows/test-avd.yml - with: - api-level: 21 - arch: x86_64 diff --git a/.github/workflows/test-avd-22.yml b/.github/workflows/test-avd-22.yml deleted file mode 100644 index 41ea3420f..000000000 --- a/.github/workflows/test-avd-22.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: daily-test-avd-22 - -on: - push: - branches: [ test-all-avd ] - -jobs: - job1: - uses: ./.github/workflows/test-avd.yml - with: - api-level: 22 - arch: x86_64 diff --git a/.github/workflows/test-avd-23.yml b/.github/workflows/test-avd-23.yml deleted file mode 100644 index af5a9a84a..000000000 --- a/.github/workflows/test-avd-23.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: daily-test-avd-23 - -on: - push: - branches: [ test-all-avd ] - -jobs: - job1: - uses: ./.github/workflows/test-avd.yml - with: - api-level: 23 - arch: x86_64 diff --git a/.github/workflows/test-avd-24.yml b/.github/workflows/test-avd-24.yml deleted file mode 100644 index 5a1107089..000000000 --- a/.github/workflows/test-avd-24.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: daily-test-avd-24 - -on: - push: - branches: [ test-all-avd ] - -jobs: - job1: - uses: ./.github/workflows/test-avd.yml - with: - api-level: 24 - arch: x86_64 diff --git a/.github/workflows/test-avd-25.yml b/.github/workflows/test-avd-25.yml deleted file mode 100644 index 034f9627a..000000000 --- a/.github/workflows/test-avd-25.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: daily-test-avd-25 - -on: - push: - branches: [ test-all-avd ] - -jobs: - job1: - uses: ./.github/workflows/test-avd.yml - with: - api-level: 25 - arch: x86_64 diff --git a/.github/workflows/test-avd-26.yml b/.github/workflows/test-avd-26.yml deleted file mode 100644 index a9f406be2..000000000 --- a/.github/workflows/test-avd-26.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: daily-test-avd-26 - -on: - push: - branches: [ test-all-avd ] - -jobs: - job1: - uses: ./.github/workflows/test-avd.yml - with: - api-level: 26 - arch: x86_64 diff --git a/.github/workflows/test-avd-27.yml b/.github/workflows/test-avd-27.yml deleted file mode 100644 index 151e75bf5..000000000 --- a/.github/workflows/test-avd-27.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: daily-test-avd-27 - -on: - push: - branches: [ test-all-avd ] - -jobs: - job1: - uses: ./.github/workflows/test-avd.yml - with: - api-level: 27 - arch: x86_64 diff --git a/.github/workflows/test-avd-28.yml b/.github/workflows/test-avd-28.yml deleted file mode 100644 index ed7daf243..000000000 --- a/.github/workflows/test-avd-28.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: daily-test-avd-28 - -on: - push: - branches: [ test-all-avd ] - -jobs: - job1: - uses: ./.github/workflows/test-avd.yml - with: - api-level: 28 - arch: x86_64 diff --git a/.github/workflows/test-avd-29.yml b/.github/workflows/test-avd-29.yml deleted file mode 100644 index bbefbde34..000000000 --- a/.github/workflows/test-avd-29.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: daily-test-avd-29 - -on: - push: - branches: [ test-all-avd ] - -jobs: - job1: - uses: ./.github/workflows/test-avd.yml - with: - api-level: 29 - arch: x86_64 diff --git a/.github/workflows/test-avd-30.yml b/.github/workflows/test-avd-30.yml deleted file mode 100644 index f8320ef9d..000000000 --- a/.github/workflows/test-avd-30.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: daily-test-avd-30 - -on: - push: - branches: [ test-all-avd ] - -jobs: - job1: - uses: ./.github/workflows/test-avd.yml - with: - api-level: 30 - arch: x86_64 diff --git a/.github/workflows/test-avd-31.yml b/.github/workflows/test-avd-31.yml deleted file mode 100644 index 7ad0e3690..000000000 --- a/.github/workflows/test-avd-31.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: daily-test-avd-31 - -on: - push: - branches: [ test-all-avd ] - -jobs: - job1: - uses: ./.github/workflows/test-avd.yml - with: - api-level: 31 - arch: x86_64 diff --git a/.github/workflows/test-avd.yml b/.github/workflows/test-avd.yml deleted file mode 100644 index f5f579e87..000000000 --- a/.github/workflows/test-avd.yml +++ /dev/null @@ -1,54 +0,0 @@ -name: AVD测试 -on: - workflow_call: - inputs: - api-level: - required: true - type: number - arch: - required: true - type: string - -jobs: - build-and-test-on-macos: - runs-on: macos-latest - env: - DISABLE_TENCENT_MAVEN_MIRROR: true - steps: - - name: Inject slug/short variables - uses: rlespinasse/github-slug-action@v3.x - - name: checkout - uses: actions/checkout@v2 - - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: '17' - cache: 'gradle' - - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - - name: revert gradle wrapper mirror setting - run: echo 'distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip' > gradle/wrapper/gradle-wrapper.properties - - name: buildSdk - run: ./gradlew buildSdk -S - - name: build sample/source - run: ./gradlew build - - name: unit test - run: ./gradlew jvmTestSdk -S - - name: run androidTestSdk - uses: reactivecircus/android-emulator-runner@v2 - with: - api-level: ${{ inputs.api-level }} - sdcard-path-or-size: 100M - emulator-build: 8420304 - target: default - arch: ${{ inputs.arch }} - profile: pixel_2 - script: ./gradlew androidTestSdk - - name: stop gradle deamon for actions/cache - run: ./gradlew --stop diff --git a/projects/test/dynamic/host/test-dynamic-host/src/androidTest/java/com/tencent/shadow/test/cases/plugin_main/fragment_support/CommonFragmentSupportTest.java b/projects/test/dynamic/host/test-dynamic-host/src/androidTest/java/com/tencent/shadow/test/cases/plugin_main/fragment_support/CommonFragmentSupportTest.java index 71baafa25..db8f8c0ee 100644 --- a/projects/test/dynamic/host/test-dynamic-host/src/androidTest/java/com/tencent/shadow/test/cases/plugin_main/fragment_support/CommonFragmentSupportTest.java +++ b/projects/test/dynamic/host/test-dynamic-host/src/androidTest/java/com/tencent/shadow/test/cases/plugin_main/fragment_support/CommonFragmentSupportTest.java @@ -63,13 +63,6 @@ public void fragmentStartActivity() { matchTextWithViewTag("finish_button", "finish"); } - @Test - public void fragmentStartActivityWithOptions() { - Assume.assumeTrue(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M); - Espresso.onView(ViewMatchers.withTagValue(Matchers.is("fragmentStartActivityWithOptions"))).perform(ViewActions.click()); - matchTextWithViewTag("finish_button", "finish"); - } - @Test public void attachContext() { Assume.assumeTrue(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M);