From 6182db89c64df94683b39765738ff73aee44cdbe Mon Sep 17 00:00:00 2001 From: Brian Ting Date: Fri, 29 Mar 2024 15:39:56 -0700 Subject: [PATCH 1/5] Reorder GitHub workflow steps. (#2777) Reorder GitHub workflow steps so that Upload Nightly Artifacts occurs after Build Bootloader is potentionally run so that the upload includes the bootloaders. b/323963204 (cherry picked from commit 44b58d2d5117f0ea49acb6dd93cd267fe7dc7392) --- .github/actions/build/action.yaml | 4 +- .github/actions/gn/action.yaml | 8 ++-- .github/actions/on_device_tests/action.yaml | 4 +- .github/actions/on_host_test/action.yaml | 16 +++---- .../actions/upload_test_artifacts/action.yaml | 10 ++-- .github/config/evergreen-arm-hardfp.json | 19 +++++++- .github/config/evergreen-arm-softfp.json | 30 ++++++++++++ .github/config/evergreen-x64.json | 5 ++ .github/config/linux.json | 2 +- .github/workflows/main.yaml | 47 ++++++++++++++----- 10 files changed, 110 insertions(+), 35 deletions(-) diff --git a/.github/actions/build/action.yaml b/.github/actions/build/action.yaml index 28616c4afed4..927ec0bec326 100644 --- a/.github/actions/build/action.yaml +++ b/.github/actions/build/action.yaml @@ -17,14 +17,14 @@ runs: run: | set -x env - if [ -z ${COBALT_BOOTLOADER+x} ]; then + if [ -z ${COBALT_EVERGREEN_LOADER+x} ]; then BUILD_PLATFORM=${{ matrix.target_platform }} BUILD_TARGET=all if [[ "${{matrix.config}}" =~ ^(qa|gold)$ ]]; then BUILD_TARGET=default fi else - BUILD_PLATFORM=${COBALT_BOOTLOADER} + BUILD_PLATFORM=${COBALT_EVERGREEN_LOADER} BUILD_TARGET='loader_app_install elf_loader_sandbox_install native_target/crashpad_handler' fi # GitHub Runners have home set to /github/home. diff --git a/.github/actions/gn/action.yaml b/.github/actions/gn/action.yaml index 7afac0350b1e..ba027017a1cd 100644 --- a/.github/actions/gn/action.yaml +++ b/.github/actions/gn/action.yaml @@ -22,13 +22,13 @@ runs: run: | set -x extra_arguments="${{matrix.extra_gn_arguments}}" - if [ -z ${COBALT_BOOTLOADER+x} ]; then + if [ -z ${COBALT_EVERGREEN_LOADER+x} ]; then BUILD_PLATFORM=${{ matrix.target_platform }} else - BUILD_PLATFORM=${COBALT_BOOTLOADER} - if [ ! -z "${{matrix.bootloader_extra_gn_arguments}}" ] + BUILD_PLATFORM=${COBALT_EVERGREEN_LOADER} + if [ ! -z "${{matrix.evergreen_loader_extra_gn_arguments}}" ] then - extra_arguments="${{matrix.bootloader_extra_gn_arguments}}" + extra_arguments="${{matrix.evergreen_loader_extra_gn_arguments}}" fi fi gn gen $GITHUB_WORKSPACE/out/${BUILD_PLATFORM}_${{matrix.config}} --args="target_platform=\"${BUILD_PLATFORM}\" ${{matrix.sb_api_version}} ${{matrix.target_os}} ${{matrix.target_cpu}} ${extra_arguments} is_internal_build=false build_type=\"${{matrix.config}}\"" diff --git a/.github/actions/on_device_tests/action.yaml b/.github/actions/on_device_tests/action.yaml index 7b9ef1e98983..c981288dafe7 100644 --- a/.github/actions/on_device_tests/action.yaml +++ b/.github/actions/on_device_tests/action.yaml @@ -23,9 +23,9 @@ runs: echo "WORKFLOW=${WORKFLOW}" >> $GITHUB_ENV # Boot loader env - if [ "${COBALT_BOOTLOADER}" != "null" ]; then + if [ "${COBALT_EVERGREEN_LOADER}" != "null" ]; then echo "LOADER_CONFIG=${{ matrix.config }}" >> $GITHUB_ENV - echo "LOADER_PLATFORM=${COBALT_BOOTLOADER}" >> $GITHUB_ENV + echo "LOADER_PLATFORM=${COBALT_EVERGREEN_LOADER}" >> $GITHUB_ENV fi # Dimension env diff --git a/.github/actions/on_host_test/action.yaml b/.github/actions/on_host_test/action.yaml index a10a8bf2af5d..c751de0de0f9 100644 --- a/.github/actions/on_host_test/action.yaml +++ b/.github/actions/on_host_test/action.yaml @@ -39,21 +39,21 @@ runs: fi python3 ${GITHUB_WORKSPACE}/tools/create_archive.py -x -s ${GITHUB_WORKSPACE}/out/tmp/${{matrix.platform}}_${{matrix.config}}.${ARCHIVE_EXTENSION} -d ${GITHUB_WORKSPACE}/out ${parallel} rm -rf ${GITHUB_WORKSPACE}/out/tmp - - name: Download Bootloader Archive - if: ${{ env.COBALT_BOOTLOADER != null && env.COBALT_BOOTLOADER != 'null' }} + - name: Download Evergreen loader Archive + if: ${{ env.COBALT_EVERGREEN_LOADER != null && env.COBALT_EVERGREEN_LOADER != 'null' }} shell: bash env: WORKFLOW: ${{ github.workflow }} run: | set -x PROJECT_NAME=$(gcloud config get-value project) - gsutil cp gs://${PROJECT_NAME}-test-artifacts/${WORKFLOW}/${GITHUB_RUN_NUMBER}/${{matrix.platform}}_${{matrix.config}}/${COBALT_BOOTLOADER}_${{matrix.config}}.${ARCHIVE_EXTENSION} ${GITHUB_WORKSPACE}/out/tmp/${COBALT_BOOTLOADER}_${{matrix.config}}.${ARCHIVE_EXTENSION} - - name: Extract Bootloader Archive - if: ${{ env.COBALT_BOOTLOADER != null && env.COBALT_BOOTLOADER != 'null' }} + gsutil cp gs://${PROJECT_NAME}-test-artifacts/${WORKFLOW}/${GITHUB_RUN_NUMBER}/${{matrix.platform}}_${{matrix.config}}/${COBALT_EVERGREEN_LOADER}_${{matrix.config}}.${ARCHIVE_EXTENSION} ${GITHUB_WORKSPACE}/out/tmp/${COBALT_EVERGREEN_LOADER}_${{matrix.config}}.${ARCHIVE_EXTENSION} + - name: Extract Evergreen loader Archive + if: ${{ env.COBALT_EVERGREEN_LOADER != null && env.COBALT_EVERGREEN_LOADER != 'null' }} shell: bash run: | set -x - python3 ${GITHUB_WORKSPACE}/tools/create_archive.py -x -s ${GITHUB_WORKSPACE}/out/tmp/${COBALT_BOOTLOADER}_${{matrix.config}}.${ARCHIVE_EXTENSION} -d ${GITHUB_WORKSPACE}/out --parallel + python3 ${GITHUB_WORKSPACE}/tools/create_archive.py -x -s ${GITHUB_WORKSPACE}/out/tmp/${COBALT_EVERGREEN_LOADER}_${{matrix.config}}.${ARCHIVE_EXTENSION} -d ${GITHUB_WORKSPACE}/out --parallel rm -rf ${GITHUB_WORKSPACE}/out/tmp - name: Set Env Variables shell: bash @@ -66,8 +66,8 @@ runs: run: | set -x loader_args='' - if [ "${COBALT_BOOTLOADER}" != "null" ]; then - loader_args="--loader_platform ${COBALT_BOOTLOADER} --loader_config ${{matrix.config}}" + if [ "${COBALT_EVERGREEN_LOADER}" != "null" ]; then + loader_args="--loader_platform ${COBALT_EVERGREEN_LOADER} --loader_config ${{matrix.config}}" fi if [[ "${{matrix.shard}}" == 'integration' ]]; then xvfb-run -a --server-args="-screen 0 1920x1080x24i +render +extension GLX -noreset" python3 $GITHUB_WORKSPACE/cobalt/black_box_tests/black_box_tests.py --platform ${{matrix.target_platform}} --config ${{matrix.config}} ${loader_args} diff --git a/.github/actions/upload_test_artifacts/action.yaml b/.github/actions/upload_test_artifacts/action.yaml index d2923eb553a7..33eaa063fc0f 100644 --- a/.github/actions/upload_test_artifacts/action.yaml +++ b/.github/actions/upload_test_artifacts/action.yaml @@ -18,13 +18,13 @@ runs: run: | set -x project_name=$(gcloud config get-value project) - if [ -z ${COBALT_BOOTLOADER+x} ] + if [ -z ${COBALT_EVERGREEN_LOADER+x} ] then PLATFORM=${{matrix.platform}} echo "TARGET_PLATFORM=${{matrix.target_platform}}" >> $GITHUB_ENV else - PLATFORM=${COBALT_BOOTLOADER} - echo "TARGET_PLATFORM=${COBALT_BOOTLOADER}" >> $GITHUB_ENV + PLATFORM=${COBALT_EVERGREEN_LOADER} + echo "TARGET_PLATFORM=${COBALT_EVERGREEN_LOADER}" >> $GITHUB_ENV fi if [ "${{ inputs.type }}" == 'ondevice' ] @@ -56,9 +56,9 @@ runs: if [ "${{ inputs.type }}" == 'ondevice' ] then outdir="$GITHUB_WORKSPACE/out/${{matrix.target_platform}}_${{matrix.config}}" - if [ -n "${COBALT_BOOTLOADER}" ] + if [ -n "${COBALT_EVERGREEN_LOADER}" ] then - outdir="${outdir} $GITHUB_WORKSPACE/out/${COBALT_BOOTLOADER}_${{matrix.config}}" + outdir="${outdir} $GITHUB_WORKSPACE/out/${COBALT_EVERGREEN_LOADER}_${{matrix.config}}" fi python3 $GITHUB_WORKSPACE/tools/create_archive.py --test_infra -d ${{env.ARCHIVE_FILE}} -s ${outdir} elif [ "${{ inputs.type }}" == 'onhost' ] diff --git a/.github/config/evergreen-arm-hardfp.json b/.github/config/evergreen-arm-hardfp.json index 8067c723440a..a97f325a036d 100644 --- a/.github/config/evergreen-arm-hardfp.json +++ b/.github/config/evergreen-arm-hardfp.json @@ -1,6 +1,6 @@ { "docker_service": "build-raspi", - "bootloader": "raspi-2", + "evergreen_loader": "raspi-2", "on_device_test": { "enabled": true, "tests": [ @@ -25,7 +25,7 @@ "target_platform":"evergreen-arm-hardfp", "target_cpu":"target_cpu=\\\"arm\\\"", "extra_gn_arguments":"use_asan=false", - "bootloader_extra_gn_arguments": "use_asan=false is_clang=false", + "evergreen_loader_extra_gn_arguments": "use_asan=false is_clang=false", "dimension": "release_version=regex:10.*" }, { @@ -34,8 +34,13 @@ "target_platform":"evergreen-arm-hardfp", "target_cpu":"target_cpu=\\\"arm\\\"", "extra_gn_arguments":"use_asan=false", +<<<<<<< HEAD "bootloader_extra_gn_arguments":"use_asan=false is_clang=false", "sb_api_version": "sb_api_version=15", +======= + "evergreen_loader_extra_gn_arguments":"use_asan=false is_clang=false", + "sb_api_version": "15", +>>>>>>> 44b58d2d511 (Reorder GitHub workflow steps. (#2777)) "dimension": "release_version=regex:10.*" }, { @@ -44,8 +49,13 @@ "target_platform":"evergreen-arm-hardfp", "target_cpu":"target_cpu=\\\"arm\\\"", "extra_gn_arguments":"use_asan=false", +<<<<<<< HEAD "bootloader_extra_gn_arguments":"use_asan=false is_clang=false", "sb_api_version": "sb_api_version=14", +======= + "evergreen_loader_extra_gn_arguments":"use_asan=false is_clang=false", + "sb_api_version": "14", +>>>>>>> 44b58d2d511 (Reorder GitHub workflow steps. (#2777)) "dimension": "release_version=regex:10.*" }, { @@ -54,8 +64,13 @@ "target_platform":"evergreen-arm-hardfp", "target_cpu":"target_cpu=\\\"arm\\\"", "extra_gn_arguments":"use_asan=false", +<<<<<<< HEAD "bootloader_extra_gn_arguments":"use_asan=false is_clang=false", "sb_api_version": "sb_api_version=13", +======= + "evergreen_loader_extra_gn_arguments":"use_asan=false is_clang=false", + "sb_api_version": "13", +>>>>>>> 44b58d2d511 (Reorder GitHub workflow steps. (#2777)) "dimension": "release_version=regex:10.*" } ] diff --git a/.github/config/evergreen-arm-softfp.json b/.github/config/evergreen-arm-softfp.json index a90304ce3e7c..d4cec0dd9e1b 100644 --- a/.github/config/evergreen-arm-softfp.json +++ b/.github/config/evergreen-arm-softfp.json @@ -1,5 +1,20 @@ { +<<<<<<< HEAD "docker_service": "build-evergreen", +======= + "docker_service": "build-android-evergreen", + "evergreen_loader": "android-arm", + "on_device_test": { + "enabled": false, + "tests": [ + "evergreen_test", + "0", + "1", + "2", + "3" + ] + }, +>>>>>>> 44b58d2d511 (Reorder GitHub workflow steps. (#2777)) "platforms": [ "evergreen-arm-softfp", "evergreen-arm-softfp-sbversion-15", @@ -12,7 +27,12 @@ "platform":"evergreen-arm-softfp", "target_platform":"evergreen-arm-softfp", "target_cpu":"target_cpu=\\\"arm\\\"", +<<<<<<< HEAD "extra_gn_arguments":"use_asan=false" +======= + "extra_gn_arguments":"use_asan=false", + "evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true" +>>>>>>> 44b58d2d511 (Reorder GitHub workflow steps. (#2777)) }, { "name":"sbversion-15", @@ -20,7 +40,12 @@ "target_platform":"evergreen-arm-softfp", "target_cpu":"target_cpu=\\\"arm\\\"", "extra_gn_arguments":"use_asan=false", +<<<<<<< HEAD "sb_api_version":"sb_api_version=15" +======= + "sb_api_version":"15", + "evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true" +>>>>>>> 44b58d2d511 (Reorder GitHub workflow steps. (#2777)) }, { "name":"sbversion-14", @@ -28,6 +53,7 @@ "target_platform":"evergreen-arm-softfp", "target_cpu":"target_cpu=\\\"arm\\\"", "extra_gn_arguments":"use_asan=false", +<<<<<<< HEAD "sb_api_version":"sb_api_version=14" }, { @@ -37,6 +63,10 @@ "target_cpu":"target_cpu=\\\"arm\\\"", "extra_gn_arguments":"use_asan=false", "sb_api_version":"sb_api_version=13" +======= + "sb_api_version":"14", + "evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true" +>>>>>>> 44b58d2d511 (Reorder GitHub workflow steps. (#2777)) } ] } diff --git a/.github/config/evergreen-x64.json b/.github/config/evergreen-x64.json index b95a3183741a..a9ceb4fcba7b 100644 --- a/.github/config/evergreen-x64.json +++ b/.github/config/evergreen-x64.json @@ -1,8 +1,13 @@ { "docker_service": "build-linux-evergreen", "on_host_test": true, +<<<<<<< HEAD "bootloader": "linux-x64x11", "on_host_test_shards": ["0", "1", "2", "3", "blackbox", "wpt"], +======= + "evergreen_loader": "linux-x64x11", + "on_host_test_shards": ["0", "1", "2", "3", "blackbox", "wpt", "evergreen"], +>>>>>>> 44b58d2d511 (Reorder GitHub workflow steps. (#2777)) "platforms": [ "evergreen-x64", "evergreen-x64-sbversion-15", diff --git a/.github/config/linux.json b/.github/config/linux.json index 633f86511321..e1efe4b1c102 100644 --- a/.github/config/linux.json +++ b/.github/config/linux.json @@ -1,6 +1,6 @@ { "docker_service": "build-linux", - "bootloader": "linux-x64x11", + "evergreen_loader": "linux-x64x11", "on_host_test": true, "on_host_test_shards": ["0", "1", "2", "3", "blackbox", "wpt"], "platforms": [ diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 4cd3c859c8dc..916ae3487244 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -104,9 +104,21 @@ jobs: - id: set-on-host-test run: echo "on_host_test=$(cat ${GITHUB_WORKSPACE}/.github/config/${{ inputs.platform }}.json | jq -rc '.on_host_test')" >> $GITHUB_ENV - id: set-on-host-test-shards +<<<<<<< HEAD run: echo "on_host_test_shards=$(cat ${GITHUB_WORKSPACE}/.github/config/${{ inputs.platform }}.json | jq -c '.on_host_test_shards')" >> $GITHUB_ENV - id: set-on-host-test-bootloader run: echo "bootloader=$(cat ${GITHUB_WORKSPACE}/.github/config/${{ inputs.platform }}.json | jq -rc '.bootloader')" >> $GITHUB_ENV +======= + shell: bash + run: | + on_host_test_shards=$(cat ${GITHUB_WORKSPACE}/.github/config/${{ inputs.platform }}.json | jq -c '.on_host_test_shards') + echo "on_host_test_shards=${on_host_test_shards}" >> $GITHUB_ENV + - id: set-on-host-test-evergreen-loader + shell: bash + run: | + evergreen_loader=$(cat ${GITHUB_WORKSPACE}/.github/config/${{ inputs.platform }}.json | jq -rc '.evergreen_loader') + echo "evergreen_loader=${evergreen_loader}" >> $GITHUB_ENV +>>>>>>> 44b58d2d511 (Reorder GitHub workflow steps. (#2777)) - id: set-docker-service run: | echo "docker_service=$(cat ${GITHUB_WORKSPACE}/.github/config/${{ inputs.platform }}.json | jq -r '.docker_service')" >> $GITHUB_ENV @@ -118,7 +130,7 @@ jobs: on_device_test_attempts: ${{ env.on_device_test_attempts }} on_host_test: ${{ env.on_host_test }} on_host_test_shards: ${{ env.on_host_test_shards }} - bootloader: ${{ env.bootloader }} + evergreen_loader: ${{ env.evergreen_loader }} docker_service: ${{ env.docker_service }} # Builds, tags, and pushes Cobalt docker build images to ghr. @@ -229,29 +241,42 @@ jobs: if: inputs.run_api_leak_detector with: relative_manifest_path: ${{ inputs.leak_manifest_filename }} - - name: Upload Nightly Artifacts - if: ${{ ( inputs.nightly == 'true' || github.event_name == 'schedule' ) && matrix.config != 'debug' }} - uses: ./.github/actions/upload_nightly_artifacts - name: Upload On Host Test Artifacts if: ${{ matrix.config == 'devel' && needs.initialize.outputs.on_host_test == 'true' }} uses: ./.github/actions/upload_test_artifacts with: type: onhost os: linux - # For some reason passing needs.initialize.outputs.bootloader as parameter to build + # For some reason passing needs.initialize.outputs.evergreen_loader as parameter to build # action didn't work, so instead we set an env var. +<<<<<<< HEAD - name: Set bootloader config if: ${{ needs.initialize.outputs.bootloader != 'null' }} run: echo "COBALT_BOOTLOADER=${{needs.initialize.outputs.bootloader}}" >> $GITHUB_ENV # Build bootloader for on-host tests if necessary. - name: Bootloader GN if: ${{ needs.initialize.outputs.bootloader != 'null' && ( matrix.config == 'devel' || matrix.config == 'qa' ) }} +======= + - name: Set Evergreen loader config + if: ${{ needs.initialize.outputs.evergreen_loader != 'null' }} + shell: bash + run: | + set -u + COBALT_EVERGREEN_LOADER="${{needs.initialize.outputs.evergreen_loader}}" + echo "COBALT_EVERGREEN_LOADER=${COBALT_EVERGREEN_LOADER}" >> $GITHUB_ENV + # Build Evergreen loader for on-host tests if necessary. + - name: Evergreen loader GN + if: ${{ needs.initialize.outputs.evergreen_loader != 'null' && ( matrix.config == 'devel' || matrix.config == 'qa' ) }} +>>>>>>> 44b58d2d511 (Reorder GitHub workflow steps. (#2777)) uses: ./.github/actions/gn - - name: Build Bootloader - if: ${{ needs.initialize.outputs.bootloader != 'null' && ( matrix.config == 'devel' || matrix.config == 'qa' ) }} + - name: Build Evergreen loader + if: ${{ needs.initialize.outputs.evergreen_loader != 'null' && ( matrix.config == 'devel' || matrix.config == 'qa' ) }} uses: ./.github/actions/build - - name: Upload Bootloader On Host Test Artifacts - if: ${{ needs.initialize.outputs.bootloader != 'null' && matrix.config == 'devel' && needs.initialize.outputs.on_host_test == 'true'}} + - name: Upload Nightly Artifacts + if: ${{ ( inputs.nightly == 'true' || github.event_name == 'schedule' ) && matrix.config != 'debug' }} + uses: ./.github/actions/upload_nightly_artifacts + - name: Upload Evergreen loader On Host Test Artifacts + if: ${{ needs.initialize.outputs.evergreen_loader != 'null' && matrix.config == 'devel' && needs.initialize.outputs.on_host_test == 'true'}} uses: ./.github/actions/upload_test_artifacts with: type: onhost @@ -293,7 +318,7 @@ jobs: shard: ${{ fromJson(needs.initialize.outputs.on_device_test).tests }} include: ${{ fromJson(needs.initialize.outputs.includes) }} env: - COBALT_BOOTLOADER: ${{ needs.initialize.outputs.bootloader }} + COBALT_EVERGREEN_LOADER: ${{ needs.initialize.outputs.evergreen_loader }} ON_DEVICE_TEST_ATTEMPTS: ${{ needs.initialize.outputs.on_device_test_attempts }} MODULAR_BUILD: ${{ inputs.modular && 1 || 0 }} steps: @@ -325,7 +350,7 @@ jobs: # For some reason tests complaining about HOME set to /github/home # with permission denied error. HOME: /root - COBALT_BOOTLOADER: ${{needs.initialize.outputs.bootloader}} + COBALT_EVERGREEN_LOADER: ${{needs.initialize.outputs.evergreen_loader}} MODULAR_BUILD: ${{ inputs.modular && 1 || 0 }} steps: - name: Checkout From 6eb70b66fef6510e0c55abe5066cda5b036627a9 Mon Sep 17 00:00:00 2001 From: Brian Ting Date: Sat, 30 Mar 2024 01:25:26 -0700 Subject: [PATCH 2/5] Update evergreen-arm-hardfp.json --- .github/config/evergreen-arm-hardfp.json | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/.github/config/evergreen-arm-hardfp.json b/.github/config/evergreen-arm-hardfp.json index a97f325a036d..13b3cd366bb8 100644 --- a/.github/config/evergreen-arm-hardfp.json +++ b/.github/config/evergreen-arm-hardfp.json @@ -34,13 +34,8 @@ "target_platform":"evergreen-arm-hardfp", "target_cpu":"target_cpu=\\\"arm\\\"", "extra_gn_arguments":"use_asan=false", -<<<<<<< HEAD - "bootloader_extra_gn_arguments":"use_asan=false is_clang=false", - "sb_api_version": "sb_api_version=15", -======= "evergreen_loader_extra_gn_arguments":"use_asan=false is_clang=false", - "sb_api_version": "15", ->>>>>>> 44b58d2d511 (Reorder GitHub workflow steps. (#2777)) + "sb_api_version": "sb_api_version=15", "dimension": "release_version=regex:10.*" }, { @@ -49,13 +44,8 @@ "target_platform":"evergreen-arm-hardfp", "target_cpu":"target_cpu=\\\"arm\\\"", "extra_gn_arguments":"use_asan=false", -<<<<<<< HEAD - "bootloader_extra_gn_arguments":"use_asan=false is_clang=false", - "sb_api_version": "sb_api_version=14", -======= "evergreen_loader_extra_gn_arguments":"use_asan=false is_clang=false", - "sb_api_version": "14", ->>>>>>> 44b58d2d511 (Reorder GitHub workflow steps. (#2777)) + "sb_api_version": "sb_api_version=14", "dimension": "release_version=regex:10.*" }, { @@ -64,13 +54,8 @@ "target_platform":"evergreen-arm-hardfp", "target_cpu":"target_cpu=\\\"arm\\\"", "extra_gn_arguments":"use_asan=false", -<<<<<<< HEAD - "bootloader_extra_gn_arguments":"use_asan=false is_clang=false", - "sb_api_version": "sb_api_version=13", -======= "evergreen_loader_extra_gn_arguments":"use_asan=false is_clang=false", - "sb_api_version": "13", ->>>>>>> 44b58d2d511 (Reorder GitHub workflow steps. (#2777)) + "sb_api_version": "sb_api_version=13", "dimension": "release_version=regex:10.*" } ] From 69069019df0a544b6d890fed0ac2ebd1038a07d2 Mon Sep 17 00:00:00 2001 From: Brian Ting Date: Sat, 30 Mar 2024 01:27:13 -0700 Subject: [PATCH 3/5] Update evergreen-arm-softfp.json --- .github/config/evergreen-arm-softfp.json | 30 ------------------------ 1 file changed, 30 deletions(-) diff --git a/.github/config/evergreen-arm-softfp.json b/.github/config/evergreen-arm-softfp.json index d4cec0dd9e1b..a90304ce3e7c 100644 --- a/.github/config/evergreen-arm-softfp.json +++ b/.github/config/evergreen-arm-softfp.json @@ -1,20 +1,5 @@ { -<<<<<<< HEAD "docker_service": "build-evergreen", -======= - "docker_service": "build-android-evergreen", - "evergreen_loader": "android-arm", - "on_device_test": { - "enabled": false, - "tests": [ - "evergreen_test", - "0", - "1", - "2", - "3" - ] - }, ->>>>>>> 44b58d2d511 (Reorder GitHub workflow steps. (#2777)) "platforms": [ "evergreen-arm-softfp", "evergreen-arm-softfp-sbversion-15", @@ -27,12 +12,7 @@ "platform":"evergreen-arm-softfp", "target_platform":"evergreen-arm-softfp", "target_cpu":"target_cpu=\\\"arm\\\"", -<<<<<<< HEAD "extra_gn_arguments":"use_asan=false" -======= - "extra_gn_arguments":"use_asan=false", - "evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true" ->>>>>>> 44b58d2d511 (Reorder GitHub workflow steps. (#2777)) }, { "name":"sbversion-15", @@ -40,12 +20,7 @@ "target_platform":"evergreen-arm-softfp", "target_cpu":"target_cpu=\\\"arm\\\"", "extra_gn_arguments":"use_asan=false", -<<<<<<< HEAD "sb_api_version":"sb_api_version=15" -======= - "sb_api_version":"15", - "evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true" ->>>>>>> 44b58d2d511 (Reorder GitHub workflow steps. (#2777)) }, { "name":"sbversion-14", @@ -53,7 +28,6 @@ "target_platform":"evergreen-arm-softfp", "target_cpu":"target_cpu=\\\"arm\\\"", "extra_gn_arguments":"use_asan=false", -<<<<<<< HEAD "sb_api_version":"sb_api_version=14" }, { @@ -63,10 +37,6 @@ "target_cpu":"target_cpu=\\\"arm\\\"", "extra_gn_arguments":"use_asan=false", "sb_api_version":"sb_api_version=13" -======= - "sb_api_version":"14", - "evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true" ->>>>>>> 44b58d2d511 (Reorder GitHub workflow steps. (#2777)) } ] } From c69c0de1bfe1f68a721538b776a0182d45b2883d Mon Sep 17 00:00:00 2001 From: Brian Ting Date: Sat, 30 Mar 2024 01:28:18 -0700 Subject: [PATCH 4/5] Update evergreen-x64.json --- .github/config/evergreen-x64.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/config/evergreen-x64.json b/.github/config/evergreen-x64.json index a9ceb4fcba7b..0f18b571e021 100644 --- a/.github/config/evergreen-x64.json +++ b/.github/config/evergreen-x64.json @@ -1,13 +1,8 @@ { "docker_service": "build-linux-evergreen", "on_host_test": true, -<<<<<<< HEAD - "bootloader": "linux-x64x11", - "on_host_test_shards": ["0", "1", "2", "3", "blackbox", "wpt"], -======= "evergreen_loader": "linux-x64x11", - "on_host_test_shards": ["0", "1", "2", "3", "blackbox", "wpt", "evergreen"], ->>>>>>> 44b58d2d511 (Reorder GitHub workflow steps. (#2777)) + "on_host_test_shards": ["0", "1", "2", "3", "blackbox", "wpt"], "platforms": [ "evergreen-x64", "evergreen-x64-sbversion-15", From c6b8892d3295e6b20f55f8475579ab150d20729a Mon Sep 17 00:00:00 2001 From: Brian Ting Date: Sat, 30 Mar 2024 01:31:11 -0700 Subject: [PATCH 5/5] Update main.yaml --- .github/workflows/main.yaml | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 916ae3487244..4717d45d8a5e 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -104,21 +104,9 @@ jobs: - id: set-on-host-test run: echo "on_host_test=$(cat ${GITHUB_WORKSPACE}/.github/config/${{ inputs.platform }}.json | jq -rc '.on_host_test')" >> $GITHUB_ENV - id: set-on-host-test-shards -<<<<<<< HEAD run: echo "on_host_test_shards=$(cat ${GITHUB_WORKSPACE}/.github/config/${{ inputs.platform }}.json | jq -c '.on_host_test_shards')" >> $GITHUB_ENV - - id: set-on-host-test-bootloader - run: echo "bootloader=$(cat ${GITHUB_WORKSPACE}/.github/config/${{ inputs.platform }}.json | jq -rc '.bootloader')" >> $GITHUB_ENV -======= - shell: bash - run: | - on_host_test_shards=$(cat ${GITHUB_WORKSPACE}/.github/config/${{ inputs.platform }}.json | jq -c '.on_host_test_shards') - echo "on_host_test_shards=${on_host_test_shards}" >> $GITHUB_ENV - id: set-on-host-test-evergreen-loader - shell: bash - run: | - evergreen_loader=$(cat ${GITHUB_WORKSPACE}/.github/config/${{ inputs.platform }}.json | jq -rc '.evergreen_loader') - echo "evergreen_loader=${evergreen_loader}" >> $GITHUB_ENV ->>>>>>> 44b58d2d511 (Reorder GitHub workflow steps. (#2777)) + run: echo "evergreen_loader=$(cat ${GITHUB_WORKSPACE}/.github/config/${{ inputs.platform }}.json | jq -rc '.evergreen_loader')" >> $GITHUB_ENV - id: set-docker-service run: | echo "docker_service=$(cat ${GITHUB_WORKSPACE}/.github/config/${{ inputs.platform }}.json | jq -r '.docker_service')" >> $GITHUB_ENV @@ -249,25 +237,12 @@ jobs: os: linux # For some reason passing needs.initialize.outputs.evergreen_loader as parameter to build # action didn't work, so instead we set an env var. -<<<<<<< HEAD - - name: Set bootloader config - if: ${{ needs.initialize.outputs.bootloader != 'null' }} - run: echo "COBALT_BOOTLOADER=${{needs.initialize.outputs.bootloader}}" >> $GITHUB_ENV - # Build bootloader for on-host tests if necessary. - - name: Bootloader GN - if: ${{ needs.initialize.outputs.bootloader != 'null' && ( matrix.config == 'devel' || matrix.config == 'qa' ) }} -======= - name: Set Evergreen loader config if: ${{ needs.initialize.outputs.evergreen_loader != 'null' }} - shell: bash - run: | - set -u - COBALT_EVERGREEN_LOADER="${{needs.initialize.outputs.evergreen_loader}}" - echo "COBALT_EVERGREEN_LOADER=${COBALT_EVERGREEN_LOADER}" >> $GITHUB_ENV + run: echo "COBALT_EVERGREEN_LOADER=${{needs.initialize.outputs.evergreen_loader}}" >> $GITHUB_ENV # Build Evergreen loader for on-host tests if necessary. - name: Evergreen loader GN if: ${{ needs.initialize.outputs.evergreen_loader != 'null' && ( matrix.config == 'devel' || matrix.config == 'qa' ) }} ->>>>>>> 44b58d2d511 (Reorder GitHub workflow steps. (#2777)) uses: ./.github/actions/gn - name: Build Evergreen loader if: ${{ needs.initialize.outputs.evergreen_loader != 'null' && ( matrix.config == 'devel' || matrix.config == 'qa' ) }}