Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Commit 5ad7a68

Browse files
infinity0gavofyork
authored andcommitted
Make build work with rustc 1.37 stable and RUSTC_BOOTSTRAP=1 (#3844)
* Make build work with rustc 1.37 stable and RUSTC_BOOTSTRAP=1 * Bump versions to run CI
1 parent f5ea01e commit 5ad7a68

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

core/sr-std/without_std.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
// You should have received a copy of the GNU General Public License
1515
// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
1616

17-
#[cfg(feature = "nightly")]
1817
#[doc(hidden)]
1918
pub extern crate alloc;
2019

core/utils/wasm-builder/src/prerequisites.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@
1616

1717
use std::{process::{Command, Stdio}, fs};
1818

19+
use std::env;
1920
use tempfile::tempdir;
2021

2122
/// Checks that all prerequisites are installed.
2223
///
2324
/// # Returns
2425
/// Returns `None` if everything was found and `Some(ERR_MSG)` if something could not be found.
2526
pub fn check() -> Option<&'static str> {
26-
if !check_nightly_installed() {
27+
if !rustc_stable_forced_to_nightly() && !check_nightly_installed(){
2728
return Some("Rust nightly not installed, please install it!")
2829
}
2930

@@ -39,6 +40,10 @@ pub fn check() -> Option<&'static str> {
3940
check_wasm_toolchain_installed()
4041
}
4142

43+
fn rustc_stable_forced_to_nightly() -> bool {
44+
env::var("RUSTC_BOOTSTRAP") == Ok("1".to_string())
45+
}
46+
4247
fn check_nightly_installed() -> bool {
4348
let command = crate::get_nightly_cargo();
4449
command.is_nightly()

node/runtime/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
8484
// and set impl_version to equal spec_version. If only runtime
8585
// implementation changes and behavior does not, then leave spec_version as
8686
// is and increment impl_version.
87-
spec_version: 178,
88-
impl_version: 178,
87+
spec_version: 179,
88+
impl_version: 179,
8989
apis: RUNTIME_API_VERSIONS,
9090
};
9191

0 commit comments

Comments
 (0)