manager_test.go

@@ -246,7 +246,7 @@ func TestManagerEventHandling(t *testing.T) {
 	runner := &CounterRunnable{}
 	job := NewJob[CounterResult]("job1", runner)
 
-	scheduler := &IntervalScheduler{Interval: 1 * time.Millisecond}
+	scheduler := &IntervalScheduler{Interval: 2 * time.Millisecond}
 	err = mgr.ScheduleJob(job, scheduler)
 	assert.Nil(t, err)
 
@@ -260,11 +260,12 @@ func TestManagerEventHandling(t *testing.T) {
 
 		time.Sleep(2 * time.Millisecond)
 
-		if time.Since(startTime) > 1*time.Second {
+		if time.Since(startTime) > 100*time.Millisecond {
 			t.Fatalf("Job did not finish in time")
 		}
 	}
 
+	time.Sleep(2 * time.Millisecond)
 	err = mgr.Stop()
 	assert.Nil(t, err)
 }

nix/scripts/common.nix

@@ -91,18 +91,6 @@
    }$1" | ${pkgs.gnused}/bin/sed 's/\\/\\\\/g; s/"/\\"/g; s/$/\\n/g' | tr -d '\n'
   }
 
-  if [ -z "$DEBUG_MODE" ]; then
-    DEBUG_MODE='false'
-  fi
-
-  if [ -n "$CI_JOB_TOKEN" ]; then
-    CI_MODE='true'
-  fi
-
-  if is_true "$DEBUG_MODE" || is_true "$CI_MODE"; then
-    set -x
-  fi
-
   download_test_images() {
 
       echo_step "Downloading docker images"
@@ -141,4 +129,18 @@
       fi
   }
 
+
+  if [ -z "$DEBUG_MODE" ]; then
+    DEBUG_MODE='false'
+  fi
+
+  if [ -n "$CI_JOB_TOKEN" ]; then
+    CI_MODE='true'
+  fi
+
+  if is_true "$DEBUG_MODE" || is_true "$CI_MODE"; then
+    set -x
+  fi
+
+
 ''

nix/scripts/deploy.nix

@@ -43,19 +43,18 @@ in
     ${pkgs.git}/bin/git checkout $CI_COMMIT_REF_NAME
     ${pkgs.git}/bin/git pull origin $CI_COMMIT_REF_NAME
 
-    ${pkgs.git}/bin/git --no-pager log --decorate=short --pretty=oneline
-    ${pkgs.git}/bin/git fetch --prune --prune-tags
-
-    if ! ${pkgs.git}/bin/git --no-pager log --decorate=short --pretty=oneline
+    if ! ${pkgs.git}/bin/git --no-pager log --decorate=short --pretty=oneline -n 30
     then
         echo_fail "Error: Could not get git log."
         exit 1
     fi
 
+     ${pkgs.git}/bin/git fetch --prune --prune-tags
+
     echo_step "Bumping version"
     gitVersion=v$(version predict)
     ${pkgs.git}/bin/git tag -a $gitVersion -m"chore: bump version"
-    ${pkgs.git}/bin/git --no-pager log --decorate=short --pretty=oneline
+    ${pkgs.git}/bin/git --no-pager log --decorate=short --pretty=oneline -n 5
     ${pkgs.git}/bin/git push -o ci.skip origin ''${CI_COMMIT_REF_NAME} --tags
 
     echo_ok "done"