fix logic bugs

cross-rs · Jun 13, 2022 · 7422c00 · 7422c00
1 parent 66bf016
commit 7422c00
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/xtask/src/build_docker_image.rs b/xtask/src/build_docker_image.rs
@@ -104,7 +104,7 @@ pub fn build_docker_image(
 
                 if ["staging", "trying"]
                     .iter()
-                    .any(|branch| branch == &ref_name)
+                    .any(|branch| branch != &ref_name)
                 {
                     tags.push(format!("{image_name}:edge"));
                 }
@@ -159,7 +159,7 @@ pub fn build_docker_image(
             println!("::set-output name=image::{}", &tags[0])
         }
     }
-    if (std::env::var("GITHUB_ACTIONS").is_ok() || !force) && push {
+    if !(std::env::var("GITHUB_ACTIONS").is_ok() || !push || force) {
         panic!("refusing to push, use --force to override");
     }
     Ok(())