diff options
| author | Federico Mena Quintero <federico@gnome.org> | 2023-02-08 15:50:29 -0600 |
|---|---|---|
| committer | Federico Mena Quintero <federico@gnome.org> | 2023-02-08 15:58:39 -0600 |
| commit | f8f520f9965d43a8e3564d034701ae606f32fc32 (patch) | |
| tree | d193493a0c9b89498560373d2f0506d5b1a9ee8c | |
| parent | 5f41c8d263596cd308ff665403c76bb1524db834 (diff) | |
| download | librsvg-f8f520f9965d43a8e3564d034701ae606f32fc32.tar.gz | |
Bump the MSRV to 1.64.0
The new glib-macros requires it.
Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/792>
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | ci/container_builds.yml | 4 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | devel-docs/devel_environment.rst | 2 | ||||
| -rw-r--r-- | devel-docs/releasing.rst | 6 |
5 files changed, 11 insertions, 6 deletions
@@ -9,7 +9,7 @@ homepage = "https://wiki.gnome.org/Projects/LibRsvg" repository = "https://gitlab.gnome.org/GNOME/librsvg/" build = "build.rs" edition = "2021" -rust-version = "1.63" +rust-version = "1.64" [profile.overflow] inherits = "release" diff --git a/ci/container_builds.yml b/ci/container_builds.yml index 335247a7..6969a9df 100644 --- a/ci/container_builds.yml +++ b/ci/container_builds.yml @@ -6,9 +6,9 @@ include: variables: # When branching change the suffix to avoid conflicts with images # from the main branch - BASE_TAG: "2022-10-26.0-main" + BASE_TAG: "2023-02-08.0-main" RUST_STABLE: "1.64.0" - RUST_MINIMUM: "1.63.0" + RUST_MINIMUM: "1.64.0" .container.opensuse@common: stage: "container-build" diff --git a/configure.ac b/configure.ac index 2760ffdd..eff90d06 100644 --- a/configure.ac +++ b/configure.ac @@ -107,7 +107,8 @@ AS_IF(test x$RUSTC = xno, dnl MSRV - Minimum Supported Rust Version dnl If you change this, please update the "_manual_setup" section of devel-docs/devel_environment.rst -MINIMUM_RUST_VER=1.63 +dnl keep in sync with Cargo.toml +MINIMUM_RUST_VER=1.64 rust_version=`$RUSTC --version | sed -e 's/^rustc //g'` AX_COMPARE_VERSION([$rust_version],[lt],[$MINIMUM_RUST_VER], [ AC_MSG_ERROR([librsvg needs at least rustc version $MINIMUM_RUST_VER]) diff --git a/devel-docs/devel_environment.rst b/devel-docs/devel_environment.rst index 9facbd1f..b9e572fc 100644 --- a/devel-docs/devel_environment.rst +++ b/devel-docs/devel_environment.rst @@ -103,7 +103,7 @@ minimum version is listed here; you may use a newer version instead. **Compilers and build tools:** * a C compiler and `make` tool; we recommend GNU `make`. -* rust 1.63 or later +* rust 1.64 or later * cargo * autoconf, automake, libtool, itstool * vala (optional) diff --git a/devel-docs/releasing.rst b/devel-docs/releasing.rst index d168a7c0..68cb2b7b 100644 --- a/devel-docs/releasing.rst +++ b/devel-docs/releasing.rst @@ -100,12 +100,16 @@ Rust that is too old — instead of getting an obscure error message from ``rustc`` in the middle of the build when it finds an unsupported language construct. -Please update both of these when increasing the MSRV: +Please update all of these when increasing the MSRV: - The ``MININUM_RUST_MAJOR`` and ``MINIMUM_RUST_MINOR`` values in ``configure.ac``. - The ``rust-version`` value in ``Cargo.toml``. +- ``RUST_MINIMUM`` in ``ci/container_builds.yml``. + +- The ``_manual_setup`` section in ``devel-docs/devel_environment.rst``. + Sometimes librsvg’s dependencies update their MSRV and librsvg may need to increase it as well. Please consider the following before doing this: |