Merge branch 'main' into xb1

.github/CODEOWNERS

@@ -9,3 +9,12 @@
 /cobalt/browser/metrics/ @joeltine
 /components/metrics/ @joeltine
 /tools/metrics/ @joeltine
+
+# Temporary monitoring for merges to Chromium upstreams
+/base/ @andrewsavage1
+/build/ @andrewsavage1
+/crypto/ @andrewsavage1
+/net/ @andrewsavage1
+/third_party/abseil-cpp/ @andrewsavage1
+/third_party/modp_b64/ @andrewsavage1
+/url/ @andrewsavage1

.github/actions/docker/action.yaml

@@ -79,7 +79,7 @@ runs:
           echo "need_to_build=false" >> $GITHUB_ENV
         fi
       shell: bash
-    - name: Build containers with docker-compose
+    - name: Build containers with Docker Compose
       id: build-image
       if: env.need_to_build == 'true'
       env:

.github/actions/docker_win/action.yaml

@@ -56,7 +56,7 @@ runs:
           echo "need_to_build=false" >> $GITHUB_ENV
         fi
       shell: bash
-    - name: Build containers with docker-compose
+    - name: Build containers with Docker Compose
       if: env.need_to_build == 'true'
       env:
         DOCKER_CPUS: 2

.github/actions/on_host_test/action.yaml

@@ -84,8 +84,6 @@ runs:
           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} --test_set wpt
         elif [[ "${{matrix.shard}}" == 'evergreen' ]]; then
           xvfb-run -a --server-args="-screen 0 1920x1080x24i +render +extension GLX -noreset" python3 $GITHUB_WORKSPACE/cobalt/evergreen_tests/evergreen_tests.py --platform ${{matrix.target_platform}} --config ${{matrix.config}} ${loader_args} --no-can_mount_tmpfs
-        elif [[ "${{matrix.shard}}" == 'evergreen-as-blackbox' ]]; 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} --test_set evergreen
         elif [[ "${{matrix.shard}}" == 'coverage' ]]; then
           xvfb-run -a --server-args="-screen 0 1920x1080x24i +render +extension GLX -noreset" python3 ${GITHUB_WORKSPACE}/starboard/tools/testing/test_runner.py --platform ${{matrix.target_platform}} --config ${{matrix.config}} -r ${loader_args} --xml_output_dir=${XML_FILES_DIR} --coverage_dir=${COVERAGE_DIR} --coverage_report
         else

.github/config/evergreen-arm-softfp-no-loader.json

@@ -0,0 +1,16 @@
+{
+  "docker_service": "build-evergreen",
+  "platforms": [
+    "evergreen-arm-softfp-sbversion-13"
+  ],
+  "includes": [
+    {
+      "name":"sbversion-13",
+      "platform":"evergreen-arm-softfp-sbversion-13",
+      "target_platform":"evergreen-arm-softfp",
+      "target_cpu":"target_cpu=\\\"arm\\\"",
+      "extra_gn_arguments":"use_asan=false",
+      "sb_api_version":"sb_api_version=13"
+    }
+  ]
+}

.github/config/evergreen-arm-softfp.json

@@ -1,42 +1,48 @@
 {
-  "docker_service": "build-evergreen",
+  "docker_service": "build-android-evergreen",
+  "bootloader": "android-arm",
+  "on_device_test": {
+    "enabled": false,
+    "tests": [
+      "evergreen_test",
+      "0",
+      "1",
+      "2",
+      "3"
+    ],
+    "test_attempts": 2
+  },
   "platforms": [
     "evergreen-arm-softfp",
     "evergreen-arm-softfp-sbversion-15",
-		"evergreen-arm-softfp-sbversion-14",
-    "evergreen-arm-softfp-sbversion-13"
+		"evergreen-arm-softfp-sbversion-14"
   ],
   "includes": [
     {
       "name":"softfp",
       "platform":"evergreen-arm-softfp",
       "target_platform":"evergreen-arm-softfp",
       "target_cpu":"target_cpu=\\\"arm\\\"",
-      "extra_gn_arguments":"use_asan=false"
+      "extra_gn_arguments":"use_asan=false",
+      "bootloader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true"
     },
     {
       "name":"sbversion-15",
       "platform":"evergreen-arm-softfp-sbversion-15",
       "target_platform":"evergreen-arm-softfp",
       "target_cpu":"target_cpu=\\\"arm\\\"",
       "extra_gn_arguments":"use_asan=false",
-      "sb_api_version":"sb_api_version=15"
+      "sb_api_version":"sb_api_version=15",
+      "bootloader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true"
     },
     {
       "name":"sbversion-14",
       "platform":"evergreen-arm-softfp-sbversion-14",
       "target_platform":"evergreen-arm-softfp",
       "target_cpu":"target_cpu=\\\"arm\\\"",
       "extra_gn_arguments":"use_asan=false",
-      "sb_api_version":"sb_api_version=14"
-    },
-    {
-      "name":"sbversion-13",
-      "platform":"evergreen-arm-softfp-sbversion-13",
-      "target_platform":"evergreen-arm-softfp",
-      "target_cpu":"target_cpu=\\\"arm\\\"",
-      "extra_gn_arguments":"use_asan=false",
-      "sb_api_version":"sb_api_version=13"
+      "sb_api_version":"sb_api_version=14",
+      "bootloader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true"
     }
   ]
 }

.github/config/evergreen-x64.json

@@ -2,16 +2,7 @@
   "docker_service": "build-linux-evergreen",
   "on_host_test": true,
   "bootloader": "linux-x64x11",
-  "on_host_test_shards": [
-    "0",
-    "1",
-    "2",
-    "3",
-    "blackbox",
-    "wpt",
-    "evergreen",
-    "evergreen-as-blackbox"
-  ],
+  "on_host_test_shards": ["0", "1", "2", "3", "blackbox", "wpt", "evergreen"],
   "platforms": [
     "evergreen-x64",
     "evergreen-x64-sbversion-15",

.github/config/linux-clang-3-9.json

@@ -10,7 +10,7 @@
       "name":"clang-3-9",
       "platform":"linux-x64x11-clang-3-9",
       "target_platform":"linux-x64x11-clang-3-9",
-      "extra_gn_arguments":"using_old_compiler=true"
+      "extra_gn_arguments":"using_old_compiler=true build_with_separate_cobalt_toolchain=true"
     }
   ]
 }

.github/config/linux-gcc-6-3.json

@@ -1,5 +1,7 @@
 {
   "docker_service": "build-linux-gcc",
+  "on_host_test": true,
+  "on_host_test_shards": ["0", "1", "2", "3", "blackbox", "wpt"],
   "platforms": [
     "linux-x64x11-gcc-6-3"
   ],
@@ -8,7 +10,7 @@
       "name":"gcc-6-3",
       "platform":"linux-x64x11-gcc-6-3",
       "target_platform":"linux-x64x11-gcc-6-3",
-      "extra_gn_arguments":"is_clang=false using_old_compiler=true"
+      "extra_gn_arguments":"using_old_compiler=true build_with_separate_cobalt_toolchain=true"
     }
   ]
 }

.github/config/raspi-2-modular.json

@@ -0,0 +1,28 @@
+{
+  "docker_service": "build-raspi",
+  "on_device_test": {
+    "enabled": true,
+    "tests": [
+      "0",
+      "1",
+      "2",
+      "3",
+      "4",
+      "5"
+    ],
+    "test_attempts": 2
+  },
+  "platforms": [
+    "raspi-2-modular"
+  ],
+  "includes": [
+    {
+      "name":"modular",
+      "platform":"raspi-2-modular",
+      "target_platform":"raspi-2",
+      "target_cpu":"target_cpu=\\\"arm\\\"",
+      "extra_gn_arguments": "build_with_separate_cobalt_toolchain=true use_asan=false",
+      "dimension": "release_version=regex:10.*"
+    }
+  ]
+}

.github/workflows/evergreen.yaml

@@ -49,6 +49,15 @@ jobs:
       platform: evergreen-arm-softfp
       nightly: ${{ github.event.inputs.nightly }}
       run_api_leak_detector: true
+  evergreen-arm-softfp-no-loader:
+    uses: ./.github/workflows/main.yaml
+    permissions:
+      packages: write
+      pull-requests: write
+    with:
+      platform: evergreen-arm-softfp-no-loader
+      nightly: ${{ github.event.inputs.nightly }}
+      run_api_leak_detector: true
   evergreen-arm64:
     uses: ./.github/workflows/main.yaml
     permissions:

.github/workflows/label-cherry-pick.yaml

@@ -71,25 +71,26 @@ jobs:
           git config --global user.email "[email protected]"
 
       - name: Cherry pick merge commit
+        id: cherry-pick
+        continue-on-error: true
         run: |
           git fetch origin ${{ matrix.target_branch }}
           set +e
           git cherry-pick -x $MERGE_COMMIT_SHA
           RES=$?
           set -e
-          if [ $RES -eq 0 ]; then
-            echo "CREATE_PR_AS_DRAFT=false" >> $GITHUB_ENV
-          else
-            echo "CREATE_PR_AS_DRAFT=true" >> $GITHUB_ENV
+          if [ $RES -ne 0 ]; then
             git add .
             git cherry-pick --continue
           fi
+          exit $RES
 
       - name: Create Pull Request
+        id: create-pr
         uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04 # v4.2.3
         with:
           token: ${{ secrets.CHERRY_PICK_TOKEN }}
-          draft: ${{ env.CREATE_PR_AS_DRAFT }}
+          draft: ${{ steps.cherry-pick.outcome == 'failure' }}
           base: ${{ matrix.target_branch }}
           branch: "${{ matrix.target_branch }}-${{ github.event.pull_request.number }}"
           committer: GitHub Release Automation <[email protected]>
@@ -99,3 +100,15 @@ jobs:
             Refer to the original PR: https://github.com/${{ github.repository }}/pull/${{ github.event.pull_request.number }}
 
             ${{ github.event.pull_request.body }}
+      - name: PR Comment
+        if: ${{ success() && steps.cherry-pick.outcome == 'failure' }}
+        uses: actions/github-script@v2
+        with:
+          github-token: ${{ secrets.CHERRY_PICK_TOKEN }}
+          script: |
+            github.issues.createComment({
+              issue_number: ${{ steps.create-pr.outputs.pull-request-number }},
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: '> [!IMPORTANT]\n> The cherry-pick failed! Check out the PR branch (${{ matrix.target_branch }}-${{ github.event.pull_request.number }}) and fix the conflicts before proceeding.'
+            })

.github/workflows/linux.yaml

@@ -38,6 +38,7 @@ jobs:
     with:
       platform: linux-clang-3-9
       nightly: ${{ github.event.inputs.nightly }}
+      modular: true
   linux-gcc-6-3:
     uses: ./.github/workflows/main.yaml
     permissions:
@@ -46,6 +47,7 @@ jobs:
     with:
       platform: linux-gcc-6-3
       nightly: ${{ github.event.inputs.nightly }}
+      modular: true
   # TODO(b/285632780): Enable blackbox tests for modular linux workflows.
   linux-modular:
     uses: ./.github/workflows/main.yaml

.github/workflows/main.yaml

@@ -86,23 +86,45 @@ jobs:
             ${GITHUB_PR_REPO_URL}/issues/${GITHUB_EVENT_NUMBER}/labels/runtest
         shell: bash
       - id: set-platforms
-        run: echo "platforms=$(cat ${GITHUB_WORKSPACE}/.github/config/${{ inputs.platform }}.json | jq -c '.platforms')" >> $GITHUB_ENV
+        shell: bash
+        run: |
+          platforms=$(cat ${GITHUB_WORKSPACE}/.github/config/${{ inputs.platform }}.json | jq -c '.platforms')
+          echo "platforms=${platforms}" >> $GITHUB_ENV
       - id: set-includes
-        run: echo "includes=$(cat ${GITHUB_WORKSPACE}/.github/config/${{ inputs.platform }}.json | jq -c '.includes')" >> $GITHUB_ENV
+        shell: bash
+        run: |
+          includes=$(cat ${GITHUB_WORKSPACE}/.github/config/${{ inputs.platform }}.json | jq -c '.includes')
+          echo "includes=${includes}" >> $GITHUB_ENV
       - id: set-on-device-test
-        run: echo "on_device_test=$(cat ${GITHUB_WORKSPACE}/.github/config/${{ inputs.platform }}.json | jq -rc '.on_device_test')" >> $GITHUB_ENV
+        shell: bash
+        run: |
+          on_device_test=$(cat ${GITHUB_WORKSPACE}/.github/config/${{ inputs.platform }}.json | jq -rc '.on_device_test')
+          echo "on_device_test=${on_device_test}" >> $GITHUB_ENV
       - id: set-on-device-test-attempts
-        run: echo "on_device_test_attempts=$(cat ${GITHUB_WORKSPACE}/.github/config/${{ inputs.platform }}.json | jq -rc '.on_device_test.test_attempts // empty')" >> $GITHUB_ENV
+        shell: bash
+        run: |
+          on_device_test_attempts=$(cat ${GITHUB_WORKSPACE}/.github/config/${{ inputs.platform }}.json | jq -rc '.on_device_test.test_attempts // empty')
+          echo "on_device_test_attempts=${on_device_test_attempts}" >> $GITHUB_ENV
       - 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
+        shell: bash
+        run: |
+          on_host_test=$(cat ${GITHUB_WORKSPACE}/.github/config/${{ inputs.platform }}.json | jq -rc '.on_host_test')
+          echo "on_host_test=${on_host_test}" >> $GITHUB_ENV
       - id: set-on-host-test-shards
-        run: echo "on_host_test_shards=$(cat ${GITHUB_WORKSPACE}/.github/config/${{ inputs.platform }}.json | jq -c '.on_host_test_shards')" >> $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-bootloader
-        run: echo "bootloader=$(cat ${GITHUB_WORKSPACE}/.github/config/${{ inputs.platform }}.json | jq -rc '.bootloader')" >> $GITHUB_ENV
+        shell: bash
+        run: |
+          bootloader=$(cat ${GITHUB_WORKSPACE}/.github/config/${{ inputs.platform }}.json | jq -rc '.bootloader')
+          echo "bootloader=${bootloader}" >> $GITHUB_ENV
       - id: set-docker-service
+        shell: bash
         run: |
-          echo "docker_service=$(cat ${GITHUB_WORKSPACE}/.github/config/${{ inputs.platform }}.json | jq -r '.docker_service')" >> $GITHUB_ENV
-          echo $platforms
+          docker_service=$(cat ${GITHUB_WORKSPACE}/.github/config/${{ inputs.platform }}.json | jq -r '.docker_service')
+          echo "docker_service=${docker_service}" >> $GITHUB_ENV
     outputs:
       platforms: ${{ env.platforms }}
       includes: ${{ env.includes }}
@@ -123,7 +145,7 @@ jobs:
       - name: Checkout files
         uses: kaidokert/[email protected]
         with:
-          fetch-depth: 2
+          fetch-depth: 0
           persist-credentials: false
       - name: Login to Docker Registry ${{env.REGISTRY}}
         uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
@@ -139,7 +161,9 @@ jobs:
           docker_image: cobalt-${{ needs.initialize.outputs.docker_service }}
       - name: Set Docker Tag Output
         id: set-docker-tag-output
+        shell: bash
         run: |
+          set -u
           echo $DOCKER_TAG
           echo "docker_tag=$DOCKER_TAG"  >> $GITHUB_ENV
     outputs:
@@ -172,7 +196,9 @@ jobs:
           docker_image: cobalt-linux-x64x11-unittest
       - name: Set Docker Tag Output
         id: set-docker-unittest-tag-output
+        shell: bash
         run: |
+          set -u
           echo $DOCKER_TAG
           echo "docker_unittest_tag=$DOCKER_TAG" >> $GITHUB_ENV
     outputs:
@@ -225,7 +251,11 @@ jobs:
       # action didn't work, so instead we set an env var.
       - name: Set bootloader config
         if: ${{ needs.initialize.outputs.bootloader != 'null' }}
-        run: echo "COBALT_BOOTLOADER=${{needs.initialize.outputs.bootloader}}" >> $GITHUB_ENV
+        shell: bash
+        run: |
+           set -u
+           COBALT_BOOTLOADER="${{needs.initialize.outputs.bootloader}}"
+           echo "COBALT_BOOTLOADER=${COBALT_BOOTLOADER}" >> $GITHUB_ENV
       # Build bootloader for on-host tests if necessary.
       - name: Bootloader GN
         if: ${{ needs.initialize.outputs.bootloader != 'null' && matrix.config == 'devel' }}