diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 828a3bc71b87b..689193c6e249f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -303,20 +303,6 @@ jobs: NO_LLVM_ASSERTIONS: 1 NO_DEBUG_ASSERTIONS: 1 os: macos-latest - - name: dist-aarch64-apple - env: - SCRIPT: "./x.py dist --stage 2" - RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --host=aarch64-apple-darwin --target=aarch64-apple-darwin --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false" - RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 - SELECT_XCODE: /Applications/Xcode_12_beta.app - USE_XCODE_CLANG: 1 - MACOSX_DEPLOYMENT_TARGET: 11.0 - MACOSX_STD_DEPLOYMENT_TARGET: 11.0 - NO_LLVM_ASSERTIONS: 1 - NO_DEBUG_ASSERTIONS: 1 - DIST_REQUIRE_ALL_TOOLS: 1 - JEMALLOC_SYS_WITH_LG_PAGE: 14 - os: macos-latest - name: x86_64-msvc-1 env: RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler" diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 090b06f2a0a7f..923e256b85853 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -462,35 +462,35 @@ jobs: <<: *job-macos-xl # This target only needs to support 11.0 and up as nothing else supports the hardware - - name: dist-aarch64-apple - env: - SCRIPT: ./x.py dist --stage 2 - RUST_CONFIGURE_ARGS: >- - --build=x86_64-apple-darwin - --host=aarch64-apple-darwin - --target=aarch64-apple-darwin - --enable-full-tools - --enable-sanitizers - --enable-profiler - --set rust.jemalloc - --set llvm.ninja=false - RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 - SELECT_XCODE: /Applications/Xcode_12_beta.app - USE_XCODE_CLANG: 1 - MACOSX_DEPLOYMENT_TARGET: 11.0 - MACOSX_STD_DEPLOYMENT_TARGET: 11.0 - NO_LLVM_ASSERTIONS: 1 - NO_DEBUG_ASSERTIONS: 1 - DIST_REQUIRE_ALL_TOOLS: 1 - # Corresponds to 16K page size - # - # Shouldn't be needed if jemalloc-sys is updated to - # handle this platform like iOS or if we build on - # aarch64-apple-darwin itself. - # - # https://github.com/gnzlbg/jemallocator/blob/c27a859e98e3cb790dc269773d9da71a1e918458/jemalloc-sys/build.rs#L237 - JEMALLOC_SYS_WITH_LG_PAGE: 14 - <<: *job-macos-xl + # - name: dist-aarch64-apple + # env: + # SCRIPT: ./x.py dist --stage 2 + # RUST_CONFIGURE_ARGS: >- + # --build=x86_64-apple-darwin + # --host=aarch64-apple-darwin + # --target=aarch64-apple-darwin + # --enable-full-tools + # --enable-sanitizers + # --enable-profiler + # --set rust.jemalloc + # --set llvm.ninja=false + # RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 + # SELECT_XCODE: /Applications/Xcode_12_beta.app + # USE_XCODE_CLANG: 1 + # MACOSX_DEPLOYMENT_TARGET: 11.0 + # MACOSX_STD_DEPLOYMENT_TARGET: 11.0 + # NO_LLVM_ASSERTIONS: 1 + # NO_DEBUG_ASSERTIONS: 1 + # DIST_REQUIRE_ALL_TOOLS: 1 + # # Corresponds to 16K page size + # # + # # Shouldn't be needed if jemalloc-sys is updated to + # # handle this platform like iOS or if we build on + # # aarch64-apple-darwin itself. + # # + # # https://github.com/gnzlbg/jemallocator/blob/c27a859e98e3cb790dc269773d9da71a1e918458/jemalloc-sys/build.rs#L237 + # JEMALLOC_SYS_WITH_LG_PAGE: 14 + # <<: *job-macos-xl ###################### # Windows Builders #