build(deps): Bump submodules and dependencies (#722)

Automated changes by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action --------- Signed-off-by: GitHub <[email protected]> Signed-off-by: Kevin Li <[email protected]> Co-authored-by: KevinLiAWS <[email protected]> Co-authored-by: Kevin Li <[email protected]>
runfinch · Dec 7, 2023 · 667c692 · 667c692
1 parent e40567b
commit 667c692
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -35,13 +35,13 @@ ifneq (,$(findstring arm64,$(ARCH)))
 	LIMA_ARCH = aarch64
 	# From https://dl.fedoraproject.org/pub/fedora/linux/releases/38/Cloud/aarch64/images/
 	FINCH_OS_BASENAME ?= Fedora-Cloud-Base-38-1.6.aarch64-20231026161559.qcow2
-	LIMA_URL ?= https://deps.runfinch.com/aarch64/lima-and-qemu.macos-aarch64.1695247723.tar.gz
+	LIMA_URL ?= https://deps.runfinch.com/aarch64/lima-and-qemu.macos-aarch64.1701821611.tar.gz
 else ifneq (,$(findstring x86_64,$(ARCH)))
 	SUPPORTED_ARCH = true
 	LIMA_ARCH = x86_64
 	# From https://dl.fedoraproject.org/pub/fedora/linux/releases/38/Cloud/x86_64/images/
 	FINCH_OS_BASENAME ?= Fedora-Cloud-Base-38-1.6.x86_64-20231026161553.qcow2
-	LIMA_URL ?= https://deps.runfinch.com/x86-64/lima-and-qemu.macos-x86_64.1695247723.tar.gz
+	LIMA_URL ?= https://deps.runfinch.com/x86-64/lima-and-qemu.macos-x86_64.1701821611.tar.gz
 endif
 
 FINCH_OS_HASH := `shasum -a 256 $(OUTDIR)/os/$(FINCH_OS_BASENAME) | cut -d ' ' -f 1`

diff --git a/deps/finch-core b/deps/finch-core
diff --git a/e2e/vm/additional_disk_test.go b/e2e/vm/additional_disk_test.go
@@ -43,8 +43,9 @@ var testAdditionalDisk = func(o *option.Option) {
 			gomega.Expect(imageOutput).Should(gomega.ContainElement(savedImage))
 
 			// Changed in nerdctl v1.5 to [<name>] https://github.com/containerd/nerdctl/commit/11d80f274257c064924f40bd007756110d863a16
+			// And it changed back to <name> after upgrate to nerdctl v1.7.1
 			psOutput := command.StdoutAsLines(o, "ps", "--all", "--format", "{{.Names}}")
-			gomega.Expect(psOutput).Should(gomega.ContainElement("[" + containerName + "]"))
+			gomega.Expect(psOutput).Should(gomega.ContainElement(containerName))
 
 			volumeOutput := command.StdoutAsLines(o, "volume", "ls", "--format", "{{.Name}}")
 			gomega.Expect(volumeOutput).Should(gomega.ContainElement(volumeName))