CI: upgrade to Rust 1.70.0

This includes disabling debug assertions due to the `eh_frame` issue [1]. They can be re-enabled in Rust 1.72.0. This also disables handling dependency info since it is not generated anymore. Link: Rust-for-Linux#1012 [1] Signed-off-by: Miguel Ojeda <[email protected]>
ojeda · Jun 21, 2023 · b67bcf9 · b67bcf9
1 parent 68b2c66
commit b67bcf9
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -7,7 +7,7 @@ on:
 jobs:
   ci:
     runs-on: ubuntu-20.04
-    container: ghcr.io/rust-for-linux/ci:Rust-1.66.0
+    container: ghcr.io/rust-for-linux/ci:Rust-1.70.0
     timeout-minutes: 25
 
     strategy:

diff --git a/.github/workflows/kernel-arm-debug.config b/.github/workflows/kernel-arm-debug.config
@@ -1817,7 +1817,7 @@ CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 #
 # Rust hacking
 #
-CONFIG_RUST_DEBUG_ASSERTIONS=y
+#CONFIG_RUST_DEBUG_ASSERTIONS is not set
 CONFIG_RUST_OVERFLOW_CHECKS=y
 # CONFIG_RUST_OPT_LEVEL_SIMILAR_AS_CHOSEN_FOR_C is not set
 # CONFIG_RUST_OPT_LEVEL_0 is not set

diff --git a/.github/workflows/kernel-arm64-debug-thinlto.config b/.github/workflows/kernel-arm64-debug-thinlto.config
@@ -1465,7 +1465,7 @@ CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 #
 # Rust hacking
 #
-CONFIG_RUST_DEBUG_ASSERTIONS=y
+#CONFIG_RUST_DEBUG_ASSERTIONS is not set
 CONFIG_RUST_OVERFLOW_CHECKS=y
 # CONFIG_RUST_OPT_LEVEL_SIMILAR_AS_CHOSEN_FOR_C is not set
 # CONFIG_RUST_OPT_LEVEL_0 is not set

diff --git a/.github/workflows/kernel-arm64-debug.config b/.github/workflows/kernel-arm64-debug.config
@@ -1460,7 +1460,7 @@ CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 #
 # Rust hacking
 #
-CONFIG_RUST_DEBUG_ASSERTIONS=y
+#CONFIG_RUST_DEBUG_ASSERTIONS is not set
 CONFIG_RUST_OVERFLOW_CHECKS=y
 # CONFIG_RUST_OPT_LEVEL_SIMILAR_AS_CHOSEN_FOR_C is not set
 # CONFIG_RUST_OPT_LEVEL_0 is not set

diff --git a/.github/workflows/kernel-ppc64le-debug.config b/.github/workflows/kernel-ppc64le-debug.config
@@ -1582,7 +1582,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 #
 # Rust hacking
 #
-CONFIG_RUST_DEBUG_ASSERTIONS=y
+#CONFIG_RUST_DEBUG_ASSERTIONS is not set
 CONFIG_RUST_OVERFLOW_CHECKS=y
 # CONFIG_RUST_OPT_LEVEL_SIMILAR_AS_CHOSEN_FOR_C is not set
 CONFIG_RUST_OPT_LEVEL_0=y

diff --git a/.github/workflows/kernel-riscv64-debug.config b/.github/workflows/kernel-riscv64-debug.config
@@ -1310,7 +1310,7 @@ CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 #
 # Rust hacking
 #
-CONFIG_RUST_DEBUG_ASSERTIONS=y
+#CONFIG_RUST_DEBUG_ASSERTIONS is not set
 CONFIG_RUST_OVERFLOW_CHECKS=y
 # CONFIG_RUST_OPT_LEVEL_SIMILAR_AS_CHOSEN_FOR_C is not set
 CONFIG_RUST_OPT_LEVEL_0=y

diff --git a/.github/workflows/kernel-x86_64-debug-thinlto.config b/.github/workflows/kernel-x86_64-debug-thinlto.config
@@ -1533,7 +1533,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 #
 # Rust hacking
 #
-CONFIG_RUST_DEBUG_ASSERTIONS=y
+#CONFIG_RUST_DEBUG_ASSERTIONS is not set
 CONFIG_RUST_OVERFLOW_CHECKS=y
 # CONFIG_RUST_OPT_LEVEL_SIMILAR_AS_CHOSEN_FOR_C is not set
 CONFIG_RUST_OPT_LEVEL_0=y

diff --git a/.github/workflows/kernel-x86_64-debug.config b/.github/workflows/kernel-x86_64-debug.config
@@ -1536,7 +1536,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 #
 # Rust hacking
 #
-CONFIG_RUST_DEBUG_ASSERTIONS=y
+#CONFIG_RUST_DEBUG_ASSERTIONS is not set
 CONFIG_RUST_OVERFLOW_CHECKS=y
 # CONFIG_RUST_OPT_LEVEL_SIMILAR_AS_CHOSEN_FOR_C is not set
 CONFIG_RUST_OPT_LEVEL_0=y

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
@@ -309,7 +309,7 @@ quiet_cmd_rustc_rsi_rs = $(RUSTC_OR_CLIPPY_QUIET) $(quiet_modtag) $@
 	command -v $(RUSTFMT) >/dev/null && $(RUSTFMT) $@
 
 $(obj)/%.rsi: $(src)/%.rs FORCE
-	$(call if_changed_dep,rustc_rsi_rs)
+	$(call if_changed,rustc_rsi_rs)
 
 quiet_cmd_rustc_s_rs = $(RUSTC_OR_CLIPPY_QUIET) $(quiet_modtag) $@
       cmd_rustc_s_rs = $(rust_common_cmd) --emit=asm=$@ $<