Skip to content

Commit 667c692

Browse files
build(deps): Bump submodules and dependencies (runfinch#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]>
1 parent e40567b commit 667c692

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

Diff for: Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ ifneq (,$(findstring arm64,$(ARCH)))
3535
LIMA_ARCH = aarch64
3636
# From https://dl.fedoraproject.org/pub/fedora/linux/releases/38/Cloud/aarch64/images/
3737
FINCH_OS_BASENAME ?= Fedora-Cloud-Base-38-1.6.aarch64-20231026161559.qcow2
38-
LIMA_URL ?= https://deps.runfinch.com/aarch64/lima-and-qemu.macos-aarch64.1695247723.tar.gz
38+
LIMA_URL ?= https://deps.runfinch.com/aarch64/lima-and-qemu.macos-aarch64.1701821611.tar.gz
3939
else ifneq (,$(findstring x86_64,$(ARCH)))
4040
SUPPORTED_ARCH = true
4141
LIMA_ARCH = x86_64
4242
# From https://dl.fedoraproject.org/pub/fedora/linux/releases/38/Cloud/x86_64/images/
4343
FINCH_OS_BASENAME ?= Fedora-Cloud-Base-38-1.6.x86_64-20231026161553.qcow2
44-
LIMA_URL ?= https://deps.runfinch.com/x86-64/lima-and-qemu.macos-x86_64.1695247723.tar.gz
44+
LIMA_URL ?= https://deps.runfinch.com/x86-64/lima-and-qemu.macos-x86_64.1701821611.tar.gz
4545
endif
4646

4747
FINCH_OS_HASH := `shasum -a 256 $(OUTDIR)/os/$(FINCH_OS_BASENAME) | cut -d ' ' -f 1`

Diff for: e2e/vm/additional_disk_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@ var testAdditionalDisk = func(o *option.Option) {
4343
gomega.Expect(imageOutput).Should(gomega.ContainElement(savedImage))
4444

4545
// Changed in nerdctl v1.5 to [<name>] https://github.com/containerd/nerdctl/commit/11d80f274257c064924f40bd007756110d863a16
46+
// And it changed back to <name> after upgrate to nerdctl v1.7.1
4647
psOutput := command.StdoutAsLines(o, "ps", "--all", "--format", "{{.Names}}")
47-
gomega.Expect(psOutput).Should(gomega.ContainElement("[" + containerName + "]"))
48+
gomega.Expect(psOutput).Should(gomega.ContainElement(containerName))
4849

4950
volumeOutput := command.StdoutAsLines(o, "volume", "ls", "--format", "{{.Name}}")
5051
gomega.Expect(volumeOutput).Should(gomega.ContainElement(volumeName))

0 commit comments

Comments
 (0)