diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 1451b633986b9..6df2f07aba983 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -71,6 +71,10 @@ runners: os: codebuild-ubuntu-22-8c-$github.run_id-$github.run_attempt <<: *base-job + - &job-linux-48c-ec2 + os: ec2-ubuntu26.04-c8a.12xlarge-x64-linux-$github.run_id-$github.run_attempt + <<: *base-job + envs: production: &production @@ -106,7 +110,6 @@ jobs: IMAGE: dist-x86_64-linux CODEGEN_BACKENDS: llvm,cranelift DOCKER_SCRIPT: dist.sh - <<: *job-linux-36c-codebuild # Jobs that run on each push to a pull request (PR). @@ -176,7 +179,7 @@ pr: # These jobs automatically inherit envs.try, to avoid repeating # it in each job definition. try: - - <<: *job-dist-x86_64-linux + - <<: [*job-dist-x86_64-linux, *job-linux-48c-ec2] name: dist-x86_64-linux-quick # Jobs that only run when explicitly invoked in one of the following ways: @@ -189,21 +192,19 @@ optional: env: IMAGE: pr-check-1 <<: *job-linux-4c - - name: dist-x86_64-linux-ec2 - os: ec2-ubuntu26.04-c8a.12xlarge-x64-linux-$github.run_id-$github.run_attempt - free_disk: true - env: - IMAGE: dist-x86_64-linux - CODEGEN_BACKENDS: llvm,cranelift - DOCKER_SCRIPT: dist.sh - - name: dist-x86_64-linux-ec2-quick - os: ec2-ubuntu26.04-c8a.12xlarge-x64-linux-$github.run_id-$github.run_attempt - free_disk: true + - <<: [*job-dist-x86_64-linux, *job-linux-36c-codebuild] + name: dist-x86_64-linux-codebuild + - <<: [*job-dist-x86_64-linux, *job-linux-36c-codebuild] + name: dist-x86_64-linux-quick-codebuild env: IMAGE: dist-x86_64-linux CODEGEN_BACKENDS: llvm,cranelift DOCKER_SCRIPT: dist.sh DIST_TRY_BUILD: 1 + # We repeat the try job here so that it can be explicitly executed using `@bors try jobs`, to test + # full x64 Linux dist try builds on EC2. + - <<: [*job-dist-x86_64-linux, *job-linux-48c-ec2] + name: dist-x86_64-linux-quick # Main CI jobs that have to be green to merge a commit into the default branch. # @@ -311,7 +312,7 @@ auto: - name: dist-x86_64-illumos <<: *job-linux-4c - - <<: *job-dist-x86_64-linux + - <<: [*job-dist-x86_64-linux, *job-linux-36c-codebuild] - name: dist-x86_64-linux-alt env: