summaryrefslogtreecommitdiffstats
path: root/src/ci/github-actions
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-19 09:26:03 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-19 09:26:03 +0000
commit9918693037dce8aa4bb6f08741b6812923486c18 (patch)
tree21d2b40bec7e6a7ea664acee056eb3d08e15a1cf /src/ci/github-actions
parentReleasing progress-linux version 1.75.0+dfsg1-5~progress7.99u1. (diff)
downloadrustc-9918693037dce8aa4bb6f08741b6812923486c18.tar.xz
rustc-9918693037dce8aa4bb6f08741b6812923486c18.zip
Merging upstream version 1.76.0+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/ci/github-actions')
-rw-r--r--src/ci/github-actions/ci.yml52
1 files changed, 24 insertions, 28 deletions
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index da29ffb8e..68a3afc91 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -334,7 +334,7 @@ jobs:
- name: mingw-check-tidy
<<: *job-linux-4c
- - name: x86_64-gnu-llvm-15
+ - name: x86_64-gnu-llvm-16
env:
ENABLE_GCC_CODEGEN: "1"
<<: *job-linux-16c
@@ -470,6 +470,14 @@ jobs:
- name: x86_64-gnu-aux
<<: *job-linux-4c
+ - name: x86_64-gnu-integration
+ env:
+ # Only run this job on the nightly channel. Fuchsia requires
+ # nightly features to compile, and this job would fail if
+ # executed on beta and stable.
+ CI_ONLY_WHEN_CHANNEL: nightly
+ <<: *job-linux-16c
+
- name: x86_64-gnu-debug
<<: *job-linux-8c
@@ -486,11 +494,6 @@ jobs:
RUST_BACKTRACE: 1
<<: *job-linux-8c
- - name: x86_64-gnu-llvm-15
- env:
- RUST_BACKTRACE: 1
- <<: *job-linux-8c
-
- name: x86_64-gnu-nopt
<<: *job-linux-4c
@@ -550,14 +553,17 @@ jobs:
# 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 bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin
+ SCRIPT: ./x.py dist bootstrap --include-default-paths --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
+ --disable-docs
--set rust.jemalloc
--set llvm.ninja=false
- --set rust.lto=thin
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
SELECT_XCODE: /Applications/Xcode_13.4.1.app
USE_XCODE_CLANG: 1
@@ -567,26 +573,15 @@ jobs:
NO_DEBUG_ASSERTIONS: 1
NO_OVERFLOW_CHECKS: 1
DIST_REQUIRE_ALL_TOOLS: 1
- <<: *job-macos-m1
-
- # This target only needs to support 11.0 and up as nothing else supports the hardware
- - name: aarch64-apple
- env:
- SCRIPT: ./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin
- RUST_CONFIGURE_ARGS: >-
- --enable-sanitizers
- --enable-profiler
- --set rust.jemalloc
- --set llvm.ninja=false
- RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
- SELECT_XCODE: /Applications/Xcode_13.4.1.app
- USE_XCODE_CLANG: 1
- MACOSX_DEPLOYMENT_TARGET: 11.0
- MACOSX_STD_DEPLOYMENT_TARGET: 11.0
- NO_LLVM_ASSERTIONS: 1
- NO_DEBUG_ASSERTIONS: 1
- NO_OVERFLOW_CHECKS: 1
- <<: *job-macos-m1
+ # 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 #
@@ -735,6 +730,7 @@ jobs:
CODEGEN_BACKENDS: llvm,cranelift
<<: *job-linux-16c
+
master:
name: master
runs-on: ubuntu-latest