Merge branch 'main' into develop

easybuilders · Oct 22, 2023 · 5b454da · 5b454da
2 parents 806679e + 2c5ac0a
commit 5b454da
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/docs/common-toolchains.md b/docs/common-toolchains.md
@@ -182,6 +182,7 @@ most recent revision of the common toolchains at that time.
 | `2021b` | Oct '21  | 2.37       | 11.2.0 | 4.1.1      | 3.0.4       | 0.3.18     | (incl. with OpenBLAS) | 2.1.0       | 3.3.10 |
 | `2022a` | Jun '22  | 2.38       | 11.3.0 | 4.1.4      | 3.2.0       | 0.3.20     | (incl. with OpenBLAS) | 2.2.0       | 3.3.10 |
 | `2022b` | Dec '22  | 2.39       | 12.2.0 | 4.1.4      | 3.2.1       | 0.3.21     | (incl. with OpenBLAS) | 2.2.0       | 3.3.10 |
+| `2023a` | Jun '23  | 2.40       | 12.3.0 | 4.1.5      | 3.3.1       | 0.3.23     | (incl. with OpenBLAS) | 2.2.0       | 3.3.10 |
 
 *(components marked with* \* *were patched)*
 
@@ -197,6 +198,7 @@ most recent revision of the common toolchains at that time.
 | `2021b` | Oct '21   | 2.37       | 11.2.0 | 2021.4.0          | 2021.4.0    | 2021.4.0    |
 | `2022a` | Jun '22   | 2.38       | 11.3.0 | 2022.1.0          | 2021.6.0    | 2022.1.0    |
 | `2022b` | Dec '22   | 2.39       | 12.2.0 | 2022.2.1          | 2021.7.1    | 2022.2.1    |
+| `2023a` | Jun '23   | 2.40       | 12.3.0 | 2023.1.0          | 2021.9.1    | 2023.1.0    |
 
 ## Overview of common toolchains (deprecated versions) {: #common_toolchains_overview_deprecated }
 

diff --git a/docs/easybuild-v5/overview-of-changes.md b/docs/easybuild-v5/overview-of-changes.md
@@ -32,8 +32,6 @@ feedback then please comment in the GitHub issue for the proposal.
 
 ### Planned changes for EasyBuild v5.0 {: #eb5_plans }
 
-* [enable `--trace` by default](https://github.com/easybuilders/easybuild-framework/pull/4250)
-
 !!! note
     This list is the major planned changes. It is not intended to be a complete list of all changes that are
     planned for EasyBuild v5.0.
@@ -48,7 +46,23 @@ feedback then please comment in the GitHub issue for the proposal.
 
 Various significant enhancements are included in EasyBuild v5.0, including:
 
-* *(no significant enhancements implemented so far in the `5.0.x` branches)*
+* [enable `--trace` by default][eb5_trace]
+
+### `--trace` enabled by default {: #eb5_trace }
+
+The [`--trace` option][trace] is enabled by default (see [easybuild-framework PR #4250](https://github.com/easybuilders/easybuild-framework/pull/4250)).
+This makes the output produced by the `eb` command more informative, by providing more information about what's going on in the background.
+
+To disable trace output, either:
+
+* Use the `--disable-trace` command line option;
+* Set the `$EASYBUILD_DISABLE_TRACE` environment variable;
+* Disable trace mode in a [configuration file][configuration_file]:
+
+    ``` ini
+    [override]
+    trace=0
+    ```
 
 ---
 

diff --git a/docs/tracing-progress.md b/docs/tracing-progress.md
@@ -3,12 +3,6 @@
 To trace the progress of EasyBuild while it is installing software, you
 can use `eb --trace`.
 
-!!! note
-    Tracing support was added as an experimental feature in EasyBuild v3.4.0, and thus required
-    using `--experimental`. Since EasyBuild v3.4.1, `--trace` is
-    considered stable and no longer requires the use of
-    `--experimental`.
-
 ## Trace output {: #trace_output }
 
 When `eb --trace` is used, EasyBuild will print additional output on top