Merge branch 'main' into CI-2493-latest-atlantis-changes

gocardless · Feb 9, 2024 · dffc270 · dffc270
2 parents 0b4aade + 21bdec2
commit dffc270
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 2 deletions.
diff --git a/Dockerfile.dev → _Dockerfile.dev b/Dockerfile.dev → _Dockerfile.dev
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -27,7 +27,7 @@ services:
         - redis
         build:
             context: .
-            dockerfile: Dockerfile.dev
+            dockerfile: _Dockerfile.dev
         ports:
         - 4141:4141
         volumes:

diff --git a/server/core/db/boltdb.go b/server/core/db/boltdb.go
@@ -163,7 +163,7 @@ func (b *BoltDB) List() ([]models.ProjectLock, error) {
 	for k, v := range locksBytes {
 		var lock models.ProjectLock
 		if err := json.Unmarshal(v, &lock); err != nil {
-			return locks, errors.Wrap(err, fmt.Sprintf("failed to deserialize lock at key '%d'", k))
+			return locks, errors.Wrap(err, fmt.Sprintf("failed to deserialize lock at key %q", fmt.Sprint(k)))
 		}
 		locks = append(locks, lock)
 	}

diff --git a/server/events/mock_workingdir_test.go b/server/events/mock_workingdir_test.go
diff --git a/server/events/mocks/mock_working_dir.go b/server/events/mocks/mock_working_dir.go
diff --git a/server/events/project_command_builder.go b/server/events/project_command_builder.go
@@ -3,6 +3,7 @@ package events
 import (
 	"fmt"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"sort"
 	"strings"