Merge branch 'main' into fix-deps-check

pkg/repositories/repositories.go

@@ -25,6 +25,7 @@ import (
 	"fmt"
 	"log/slog"
 	"strconv"
+	"time"
 
 	"github.com/avfs/avfs/vfs/osfs"
 	"github.com/danjacques/gofslock/fslock"
@@ -105,13 +106,16 @@ func (r *Repositories) withLock(fn func() error) error {
 		return err
 	}
 
+	blocker := func() error {
+		time.Sleep(time.Millisecond)
+		return nil
+	}
 	lockFile := r.appFs.Join(lockDir, "gilt.lock")
 	r.logger.Info(
 		"acquiring lock",
 		slog.String("lockfile", lockFile),
 	)
-
-	err = fslock.With(lockFile, fn)
+	err = fslock.WithBlocking(lockFile, blocker, fn)
 	if err != nil {
 		if errors.Is(err, fslock.ErrLockHeld) {
 			return fmt.Errorf("could not acquire lock on %s: %s", lockFile, err)

test/integration/test_cli.bats

@@ -230,3 +230,8 @@ teardown() {
 	run stat /tmp/initGiltfile.yaml
 	[ "$status" = 0 ]
 }
+
+@test "concurrent gilt overlay will block/wait" {
+	run bash -c "cd ${GILT_TEST_BASE_TMP_DIR}; (for x in {1..8}; do go run ${GILT_PROGRAM} overlay & done ; wait) 2>&1 | grep ERR"
+	[ "$status" -eq 1 ]
+}