Jelajahi Sumber

Simplify GitLab CI configuration, attempt to fix upload/download test

timvisee 6 tahun lalu
induk
melakukan
059a0d85c5
2 mengubah file dengan 4 tambahan dan 4 penghapusan
  1. 2 2
      .gitlab-ci.yml
  2. 2 2
      src/main.rs

+ 2 - 2
.gitlab-ci.yml

@@ -113,8 +113,8 @@ public-send-test:
   script:
     # Generate random file, upload/download and assert equality
     - "head -c16m </dev/urandom >testfile"
-    - "./ffsend upload testfile -n testfile.bin -a -d 10 -p secret -I"
-    - "./ffsend download $(./ffsend history -q) -p secret -I -o downloadfile"
+    - "./ffsend upload testfile -d=10 -p=secret -I"
+    - "./ffsend download $(./ffsend history -q) -p=secret -I -o=downloadfile"
     - "cmp --silent ./testfile ./downloadfile || (echo ERROR: Downloaded file is different than original; exit 1)"
 
 # Cargo crate release

+ 2 - 2
src/main.rs

@@ -136,10 +136,10 @@ fn invoke_action(handler: &Handler) -> Result<(), Error> {
     }
 
     // Get the main matcher
-    let main_matcher = MainMatcher::with(handler.matches()).unwrap();
+    let matcher_main = MainMatcher::with(handler.matches()).unwrap();
 
     // Print the main info and return
-    if !main_matcher.quiet() {
+    if !matcher_main.quiet() {
         print_main_info();
     }
     Ok(())