Skip to content

Commit 1dbacb3

Browse files
committed
Prepare the 1.19.0 beta release
* Update the cargo submodule * Update the stage0 bootstrap to 1.18.0 release * Update release channel to beta * Disable the RLS (this'll happen next beta hopefully)
1 parent 4b08831 commit 1dbacb3

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

src/ci/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ fi
4444
# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
4545
# either automatically or manually.
4646
if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then
47-
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=nightly"
47+
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=beta"
4848
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp"
4949

5050
if [ "$NO_LLVM_ASSERTIONS" = "1" ]; then

src/stage0.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
# source tarball for a stable release you'll likely see `1.x.0` for rustc and
1313
# `0.x.0` for Cargo where they were released on `date`.
1414

15-
date: 2017-04-25
16-
rustc: beta
17-
cargo: beta
15+
date: 2017-06-06
16+
rustc: 1.18.0
17+
cargo: 0.19.0
1818

1919
# When making a stable release the process currently looks like:
2020
#
@@ -34,4 +34,4 @@ cargo: beta
3434
# looking at a beta source tarball and it's uncommented we'll shortly comment it
3535
# out.
3636

37-
#dev: 1
37+
dev: 1

src/tools/build-manifest/src/main.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ impl Builder {
246246
self.package("rust-std", &mut manifest.pkg, TARGETS);
247247
self.package("rust-docs", &mut manifest.pkg, TARGETS);
248248
self.package("rust-src", &mut manifest.pkg, &["*"]);
249-
self.package("rls", &mut manifest.pkg, HOSTS);
249+
// self.package("rls", &mut manifest.pkg, HOSTS);
250250
self.package("rust-analysis", &mut manifest.pkg, TARGETS);
251251

252252
let mut pkg = Package {
@@ -282,10 +282,10 @@ impl Builder {
282282
});
283283
}
284284

285-
extensions.push(Component {
286-
pkg: "rls".to_string(),
287-
target: host.to_string(),
288-
});
285+
// extensions.push(Component {
286+
// pkg: "rls".to_string(),
287+
// target: host.to_string(),
288+
// });
289289
extensions.push(Component {
290290
pkg: "rust-analysis".to_string(),
291291
target: host.to_string(),

0 commit comments

Comments
 (0)