diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d2d4a7e3d42f9..41a3480f6803a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -156,12 +156,11 @@ jobs: - name: checkout submodules run: src/ci/scripts/checkout-submodules.sh - + - name: Setup Python uses: actions/setup-python@v5 with: - python-version: '3.x' - if: runner.environment == 'github-hosted' + python-version: '3.8' - name: install MinGW run: src/ci/scripts/install-mingw.sh diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 8c84e721f5de5..dbde5c91d0b57 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -33,7 +33,7 @@ runners: <<: *base-job - &job-aarch64-linux - os: [ self-hosted, ARM64, linux ] + os: ubuntu-22.04-arm64-8core-32gb envs: env-x86_64-apple-tests: &env-x86_64-apple-tests @@ -80,17 +80,19 @@ envs: # These jobs automatically inherit envs.pr, to avoid repeating # it in each job definition. pr: - - image: mingw-check - <<: *job-linux-4c - - image: mingw-check-tidy - continue_on_error: true - <<: *job-linux-4c - - image: x86_64-gnu-llvm-17 - env: - ENABLE_GCC_CODEGEN: "1" - <<: *job-linux-16c - - image: x86_64-gnu-tools - <<: *job-linux-16c + - image: aarch64-gnu + <<: *job-aarch64-linux +# - image: mingw-check +# <<: *job-linux-4c +# - image: mingw-check-tidy +# continue_on_error: true +# <<: *job-linux-4c +# - image: x86_64-gnu-llvm-17 +# env: +# ENABLE_GCC_CODEGEN: "1" +# <<: *job-linux-16c +# - image: x86_64-gnu-tools +# <<: *job-linux-16c # Jobs that run when you perform a try build (@bors try) # These jobs automatically inherit envs.try, to avoid repeating