Use stable toolchain

jjs-dev · Jul 31, 2020 · 042ba29 · 042ba29
1 parent f1b8151
commit 042ba29
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 14 deletions.
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
diff --git a/actions/blocks/rustc.yaml b/actions/blocks/rustc.yaml
@@ -1,6 +1,6 @@
 name: Install Rust toolchain
 uses: actions-rs/toolchain@v1
 with:
-  toolchain: nightly-2020-06-25
+  toolchain: stable
   components: clippy,rustfmt
   override: true
diff --git a/actions/deploy.yaml b/actions/deploy.yaml
@@ -7,6 +7,7 @@ on:
 env:
   CI: 1
   RUST_BACKTRACE: full
+  RUSTC_BOOTSTRAP: 1
 jobs:
   docker:
     name: docker

diff --git a/actions/pr.yaml b/actions/pr.yaml
@@ -11,6 +11,7 @@ env:
   RUST_BACKTRACE: full
   CARGO_INCREMENTAL: 0
   CARGO_BUILD_PIPELINING: "false"
+  RUSTC_BOOTSTRAP: 1
 jobs:
   hack:
     name: hack

diff --git a/src/devtool/src/build.rs b/src/devtool/src/build.rs
@@ -36,9 +36,7 @@ impl BuildOpts {
 
     fn should_build_deb(&self) -> bool {
         detect_build_type().is_pr_e2e()
-            || detect_build_type()
-                .deploy_info()
-                .contains(&DeployKind::Docker)
+            || (detect_build_type().deploy_info() == Some(DeployKind::Deb))
             || self.0.deb
     }
 
@@ -48,10 +46,7 @@ impl BuildOpts {
     }
 
     fn should_build_docker(&self) -> bool {
-        self.0.docker
-            || detect_build_type()
-                .deploy_info()
-                .contains(&DeployKind::Docker)
+        self.0.docker || (detect_build_type().deploy_info() == Some(DeployKind::Docker))
     }
 
     fn raw(&self) -> &RawBuildOpts {
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ on: @@
     env:
       CI: 1
       RUST_BACKTRACE: full
+      RUSTC_BOOTSTRAP: 1
     jobs:
       docker:
         name: docker
@@ Expand Down @@