Cherry pick PR youtube#2763: Add linux-64x11 as linux's elf loader. (y…

…outube#2767) Refer to the original PR: youtube#2763 This forces linux to build the loader_app_install, elf_loader_sandbox_install, and native_target/crashpad_handler targets. b/323963204 Co-authored-by: Brian Ting <[email protected]>
kaidokert · Mar 29, 2024 · ef9ccf7 · ef9ccf7
1 parent a387385
commit ef9ccf7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/config/linux.json b/.github/config/linux.json
@@ -1,5 +1,6 @@
 {
   "docker_service": "build-linux",
+  "bootloader": "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
@@ -245,10 +245,10 @@ jobs:
         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' }}
+        if: ${{ needs.initialize.outputs.bootloader != 'null' && ( matrix.config == 'devel' || matrix.config == 'qa' ) }}
         uses: ./.github/actions/gn
       - name: Build Bootloader
-        if: ${{ needs.initialize.outputs.bootloader != 'null' && matrix.config == 'devel' }}
+        if: ${{ needs.initialize.outputs.bootloader != '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'}}