Merge branch 'main' into use-hashes

.github/CODEOWNERS

@@ -5,16 +5,18 @@
 # For the full docs on CODEOWNERS, see:
 # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
 
+# Disable everything on working feature branch.
+
 # Metrics owners
-/cobalt/browser/metrics/ @joeltine
-/components/metrics/ @joeltine
-/tools/metrics/ @joeltine
+# /cobalt/browser/metrics/ @joeltine
+# /components/metrics/ @joeltine
+# /tools/metrics/ @joeltine
 
 # Temporary monitoring for merges to Chromium upstreams
-/base/ @andrewsavage1 @youtube/cobalt-3p-repository-owners
-/build/ @andrewsavage1 @youtube/cobalt-3p-repository-owners
-/crypto/ @andrewsavage1 @youtube/cobalt-3p-repository-owners
-/net/ @andrewsavage1 @youtube/cobalt-3p-repository-owners
-/third_party/abseil-cpp/ @andrewsavage1 @youtube/cobalt-3p-repository-owners
-/third_party/modp_b64/ @andrewsavage1 @youtube/cobalt-3p-repository-owners
-/url/ @andrewsavage1 @youtube/cobalt-3p-repository-owners
+# /base/ @andrewsavage1 @youtube/cobalt-3p-repository-owners
+# /build/ @andrewsavage1 @youtube/cobalt-3p-repository-owners
+# /crypto/ @andrewsavage1 @youtube/cobalt-3p-repository-owners
+# /net/ @andrewsavage1 @youtube/cobalt-3p-repository-owners
+# /third_party/abseil-cpp/ @andrewsavage1 @youtube/cobalt-3p-repository-owners
+# /third_party/modp_b64/ @andrewsavage1 @youtube/cobalt-3p-repository-owners
+# /url/ @andrewsavage1 @youtube/cobalt-3p-repository-owners

.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.

.github/actions/docker/action.yaml

@@ -16,7 +16,7 @@ runs:
       shell: bash
     - name: Get docker file changes
       id: changed-files
-      uses: tj-actions/changed-files@8953e851a137075e59e84b5c15fbeb3617e82f15 # v32.1.1
+      uses: tj-actions/changed-files@2d756ea4c53f7f6b397767d8723b3a10a9f35bf2 # v44
       with:
         files_ignore: third_party/**
         files: |
@@ -38,7 +38,7 @@ runs:
         set -x
         docker_tag="${{ steps.meta.outputs.tags }}"
         docker_tag="${docker_tag%.1[+,-]}"
-        echo "DOCKER_TAG=${docker_tag}" >> $GITHUB_ENV
+        echo "DOCKER_TAG=${docker_tag}" | head -n 1 >> $GITHUB_ENV
       shell: bash
     # We need to set docker tag properly for pull requests.  In those scenarios where no docker related files
     # were changed we need to use an existing image (e.g. main).  In cases where docker image is rebuilt we have

.github/actions/docker_win/action.yaml

@@ -12,7 +12,7 @@ runs:
       shell: bash
     - name: Get docker file changes
       id: changed-files
-      uses: tj-actions/changed-files@8953e851a137075e59e84b5c15fbeb3617e82f15 # v32.1.1
+      uses: tj-actions/changed-files@2d756ea4c53f7f6b397767d8723b3a10a9f35bf2 # v44
       with:
         files_ignore: third_party/**
         files: |
@@ -33,7 +33,7 @@ runs:
         set -x
         docker_tag="${{ steps.meta.outputs.tags }}"
         docker_tag="${docker_tag%.1[+,-]}"
-        echo "DOCKER_TAG=${docker_tag}" >> $GITHUB_ENV
+        echo "DOCKER_TAG=${docker_tag}" | head -n 1 >> $GITHUB_ENV
       shell: bash
     # We need to set docker tag properly for pull requests.  In those scenarios where no docker related files
     # were changed we need to use an existing image (e.g. main).  In cases where docker image is rebuilt we have

.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
         if [ -z "${{matrix.sb_api_version}}"]; then

.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
@@ -57,18 +57,21 @@ runs:
         GITHUB_PR_HEAD_USER_ID: ${{ github.event.pull_request.head.user.id }}
         GITHUB_COMMIT_AUTHOR_USERNAME: ${{ github.event.commits[0].author.username }}
         GITHUB_COMMIT_AUTHOR_EMAIL: ${{ github.event.commits[0].author.email }}
+        GITHUB_PR_NUMBER: ${{ github.event.pull_request.number }}
+        GITHUB_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
       run: |
         set -uxe
         python3 -u tools/on_device_tests_gateway_client.py \
           --token ${GITHUB_TOKEN} \
-          --change_id "${GITHUB_PR_HEAD_SHA:-$GITHUB_SHA}" \
+          --change_id ${GITHUB_PR_NUMBER:-postsubmit} \
           trigger \
           --test_type ${{ env.TEST_TYPE }} \
           --platform ${{ matrix.target_platform }} \
           --config ${{ matrix.config }} \
           --tag cobalt_github_${GITHUB_EVENT_NAME} \
           --builder_name github_${{ matrix.platform }}_tests \
           --build_number ${GITHUB_RUN_NUMBER} \
+          --builder_url ${GITHUB_RUN_URL} \
           ${LOADER_PLATFORM:+"--loader_config" "$LOADER_CONFIG"} \
           ${LOADER_PLATFORM:+"--loader_platform" "$LOADER_PLATFORM"} \
           ${DIMENSION:+"--dimension" "$DIMENSION"} \

.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
@@ -73,8 +73,8 @@ runs:
           ln -s /root/starboard-toolchains /github/home/starboard-toolchains
         fi
         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}

.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' ]

.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": [
@@ -13,9 +13,9 @@
   },
   "platforms": [
     "evergreen-arm-hardfp",
-    "evergreen-arm-hardfp-sbversion-15",
     "evergreen-arm-hardfp-sbversion-14",
-    "evergreen-arm-hardfp-sbversion-13"
+    "evergreen-arm-hardfp-sbversion-15",
+    "evergreen-arm-hardfp-sbversion-16"
   ],
   "includes": [
     {
@@ -24,37 +24,37 @@
       "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.*"
     },
     {
-      "name":"sbversion-15",
-      "platform":"evergreen-arm-hardfp-sbversion-15",
+      "name":"sbversion-14",
+      "platform":"evergreen-arm-hardfp-sbversion-14",
       "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",
-      "sb_api_version": "15",
+      "evergreen_loader_extra_gn_arguments":"use_asan=false is_clang=false",
+      "sb_api_version": "14",
       "dimension": "release_version=regex:10.*"
     },
     {
-      "name":"sbversion-14",
-      "platform":"evergreen-arm-hardfp-sbversion-14",
+      "name":"sbversion-15",
+      "platform":"evergreen-arm-hardfp-sbversion-15",
       "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",
-      "sb_api_version": "14",
+      "evergreen_loader_extra_gn_arguments":"use_asan=false is_clang=false",
+      "sb_api_version": "15",
       "dimension": "release_version=regex:10.*"
     },
     {
-      "name":"sbversion-13",
-      "platform":"evergreen-arm-hardfp-sbversion-13",
+      "name":"sbversion-16",
+      "platform":"evergreen-arm-hardfp-sbversion-16",
       "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",
-      "sb_api_version": "13",
+      "evergreen_loader_extra_gn_arguments":"use_asan=false is_clang=false",
+      "sb_api_version": "16",
       "dimension": "release_version=regex:10.*"
     }
   ]

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

@@ -1,6 +1,6 @@
 {
   "docker_service": "build-android-evergreen",
-  "bootloader": "android-arm",
+  "evergreen_loader": "android-arm",
   "on_device_test": {
     "enabled": false,
     "tests": [
@@ -13,8 +13,9 @@
   },
   "platforms": [
     "evergreen-arm-softfp",
+    "evergreen-arm-softfp-sbversion-14",
     "evergreen-arm-softfp-sbversion-15",
-		"evergreen-arm-softfp-sbversion-14"
+    "evergreen-arm-softfp-sbversion-16"
   ],
   "includes": [
     {
@@ -23,7 +24,16 @@
       "target_platform":"evergreen-arm-softfp",
       "target_cpu":"target_cpu=\\\"arm\\\"",
       "extra_gn_arguments":"use_asan=false",
-      "bootloader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true"
+      "evergreen_loader_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":"14",
+      "evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true"
     },
     {
       "name":"sbversion-15",
@@ -32,16 +42,16 @@
       "target_cpu":"target_cpu=\\\"arm\\\"",
       "extra_gn_arguments":"use_asan=false",
       "sb_api_version":"15",
-      "bootloader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true"
+      "evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true"
     },
     {
-      "name":"sbversion-14",
-      "platform":"evergreen-arm-softfp-sbversion-14",
+      "name":"sbversion-16",
+      "platform":"evergreen-arm-softfp-sbversion-16",
       "target_platform":"evergreen-arm-softfp",
       "target_cpu":"target_cpu=\\\"arm\\\"",
       "extra_gn_arguments":"use_asan=false",
-      "sb_api_version":"14",
-      "bootloader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true"
+      "sb_api_version":"16",
+      "evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true"
     }
   ]
 }

.github/config/evergreen-arm64.json

@@ -2,9 +2,9 @@
   "docker_service": "build-evergreen",
   "platforms": [
     "evergreen-arm64",
-    "evergreen-arm64-sbversion-15",
     "evergreen-arm64-sbversion-14",
-    "evergreen-arm64-sbversion-13"
+    "evergreen-arm64-sbversion-15",
+    "evergreen-arm64-sbversion-16"
   ],
   "includes": [
     {
@@ -15,28 +15,28 @@
       "extra_gn_arguments":"use_asan=false"
     },
     {
-      "name":"sbversion-15",
-      "platform":"evergreen-arm64-sbversion-15",
+      "name":"sbversion-14",
+      "platform":"evergreen-arm64-sbversion-14",
       "target_platform":"evergreen-arm64",
       "target_cpu":"target_cpu=\\\"arm64\\\"",
       "extra_gn_arguments":"use_asan=false",
-      "sb_api_version":"15"
+      "sb_api_version":"14"
     },
     {
-      "name":"sbversion-14",
-      "platform":"evergreen-arm64-sbversion-14",
+      "name":"sbversion-15",
+      "platform":"evergreen-arm64-sbversion-15",
       "target_platform":"evergreen-arm64",
       "target_cpu":"target_cpu=\\\"arm64\\\"",
       "extra_gn_arguments":"use_asan=false",
-      "sb_api_version":"14"
+      "sb_api_version":"15"
     },
     {
-      "name":"sbversion-13",
-      "platform":"evergreen-arm64-sbversion-13",
+      "name":"sbversion-16",
+      "platform":"evergreen-arm64-sbversion-16",
       "target_platform":"evergreen-arm64",
       "target_cpu":"target_cpu=\\\"arm64\\\"",
       "extra_gn_arguments":"use_asan=false",
-      "sb_api_version":"13"
+      "sb_api_version":"16"
     }
   ]
 }