diff --git a/.github/workflows/3rd_prebuilt_v8.yml b/.github/workflows/3rd_prebuilt_v8.yml index 22035e68c25..b7d37669d7e 100644 --- a/.github/workflows/3rd_prebuilt_v8.yml +++ b/.github/workflows/3rd_prebuilt_v8.yml @@ -151,7 +151,7 @@ jobs: android_prebuilt: if: github.event.inputs.is_build_for_android == 'true' needs: context_in_lowercase - runs-on: [self-hosted, linux] + runs-on: [self-hosted, linux, shared] container: image: ghcr.io/${{ needs.context_in_lowercase.outputs.repository_owner }}/android-release:latest strategy: @@ -377,7 +377,7 @@ jobs: linux_prebuilt: if: github.event.inputs.is_build_for_linux == 'true' needs: context_in_lowercase - runs-on: [self-hosted, linux] + runs-on: [self-hosted, linux, shared] container: image: ghcr.io/${{ needs.context_in_lowercase.outputs.repository_owner }}/linux-release:latest strategy: diff --git a/.github/workflows/android_build_tests.yml b/.github/workflows/android_build_tests.yml index 8c9aa5de02f..bda5c510048 100644 --- a/.github/workflows/android_build_tests.yml +++ b/.github/workflows/android_build_tests.yml @@ -14,9 +14,14 @@ on: - 'settings.gradle' - 'gradlew' - 'gradlew.bat' + +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + jobs: android_build_tests: - runs-on: ${{ github.repository == 'Tencent/Hippy' && fromJson('[''self-hosted'', ''linux'']') || 'ubuntu-latest' }} + runs-on: ${{ github.repository == 'Tencent/Hippy' && fromJson('[''self-hosted'', ''linux'', ''shared'']') || 'ubuntu-latest' }} container: image: ghcr.io/tencent/android-release:latest # repository name must be lowercase(${{ github.repository_owner }}) strategy: diff --git a/.github/workflows/android_build_tests_bypass.yml b/.github/workflows/android_build_tests_bypass.yml index e73149a1929..7a067d6dea6 100644 --- a/.github/workflows/android_build_tests_bypass.yml +++ b/.github/workflows/android_build_tests_bypass.yml @@ -14,6 +14,11 @@ on: - 'settings.gradle' - 'gradlew' - 'gradlew.bat' + +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + jobs: android_build_tests: runs-on: ubuntu-latest diff --git a/.github/workflows/docker_build_image.yml b/.github/workflows/docker_build_image.yml index cd764e9250a..2e630ca3ac9 100644 --- a/.github/workflows/docker_build_image.yml +++ b/.github/workflows/docker_build_image.yml @@ -72,7 +72,7 @@ jobs: build_images: needs: changed_images - runs-on: ${{ github.repository == 'Tencent/Hippy' && fromJson('[''self-hosted'', ''linux'']') || 'ubuntu-latest' }} + runs-on: ${{ github.repository == 'Tencent/Hippy' && fromJson('[''self-hosted'', ''linux'', ''shared'']') || 'ubuntu-latest' }} strategy: matrix: images: ${{ fromJson(needs.changed_images.outputs.changed_images) }} diff --git a/.github/workflows/gh_issue_crash_report.yml b/.github/workflows/gh_issue_crash_report.yml index 90ae9e2c88f..68b01c7a2d8 100644 --- a/.github/workflows/gh_issue_crash_report.yml +++ b/.github/workflows/gh_issue_crash_report.yml @@ -29,7 +29,7 @@ env: jobs: triage: if: github.repository == 'Tencent/Hippy' && contains(github.event.issue.title, 'crash') - runs-on: [self-hosted, linux] + runs-on: [self-hosted, linux, shared] container: image: node:latest outputs: @@ -134,7 +134,7 @@ jobs: || needs.triage.outputs.architecture == 'arm64' || needs.triage.outputs.architecture == 'x86' || needs.triage.outputs.architecture == 'x86_64') - runs-on: [self-hosted, linux] + runs-on: [self-hosted, linux, shared] container: image: ghcr.io/${{ needs.triage.outputs.repository_owner }}/android-release:latest steps: diff --git a/.github/workflows/gh_pr_merge_guard.yml b/.github/workflows/gh_pr_merge_guard.yml index 7fb788b67b8..369a56b1f7a 100644 --- a/.github/workflows/gh_pr_merge_guard.yml +++ b/.github/workflows/gh_pr_merge_guard.yml @@ -5,6 +5,7 @@ on: types: - auto_merge_enabled - auto_merge_disabled + - synchronize jobs: merge_guard: @@ -19,3 +20,8 @@ jobs: if: github.repository == 'Tencent/Hippy' && github.event.action == 'auto_merge_disabled' run: | exit -1 + - name: Synchronize # Update Branch + if: github.event.action == 'synchronize' && github.event.pull_request.auto_merge + run: | + echo "Auto-merge is enabled by a ${{ github.event.pull_request.auto_merge.enabled_by.login }}. ${{ github.event.pull_request.auto_merge.enabled_by.type == 'Bot' && 'Passing' || 'Blocking' }}." + exit ${{ github.event.pull_request.auto_merge.enabled_by.type == 'Bot' && '0' || '-1' }} diff --git a/buildconfig/cmake/InfraPackagesModule.cmake b/buildconfig/cmake/InfraPackagesModule.cmake index 7994bf75d73..f9ccd52faec 100644 --- a/buildconfig/cmake/InfraPackagesModule.cmake +++ b/buildconfig/cmake/InfraPackagesModule.cmake @@ -84,7 +84,12 @@ macro(InfraPackage_Add packageName) list(APPEND FetchContent_Declare_ARG URL_HASH ${ARG_REMOTE_HASH}) endif () + cmake_policy(PUSH) + if (POLICY CMP0135) + cmake_policy(SET CMP0135 NEW) # valid for DOWNLOAD_EXTRACT_TIMESTAMP option in CMake 3.24 and later + endif () FetchContent_Declare(${FetchContent_Declare_ARG}) + cmake_policy(POP) FetchContent_MakeAvailable(${packageNameLower}) set(__return True) endif ()