Skip to content

Commit 1b3ad94

Browse files
build(deps): Bump submodules and dependencies (runfinch#521)
1 parent 55b5235 commit 1b3ad94

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
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/37/Cloud/aarch64/images/
3737
FINCH_OS_BASENAME ?= Fedora-Cloud-Base-38-1.6.aarch64-20230713205101.qcow2
38-
LIMA_URL ?= https://deps.runfinch.com/aarch64/lima-and-qemu.macos-aarch64.1689037160.tar.gz
38+
LIMA_URL ?= https://deps.runfinch.com/aarch64/lima-and-qemu.macos-aarch64.1691201350.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/37/Cloud/x86_64/images/
4343
FINCH_OS_BASENAME ?= Fedora-Cloud-Base-38-1.6.x86_64-20230713205042.qcow2
44-
LIMA_URL ?= https://deps.runfinch.com/x86-64/lima-and-qemu.macos-x86_64.1689037160.tar.gz
44+
LIMA_URL ?= https://deps.runfinch.com/x86-64/lima-and-qemu.macos-x86_64.1691201350.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
@@ -42,8 +42,9 @@ var testAdditionalDisk = func(o *option.Option) {
4242
imageOutput := command.StdoutAsLines(o, "images", "--format", "{{.Name}}")
4343
gomega.Expect(imageOutput).Should(gomega.ContainElement(savedImage))
4444

45+
// Changed in nerdctl v1.5 to [<name>] https://github.com/containerd/nerdctl/commit/11d80f274257c064924f40bd007756110d863a16
4546
psOutput := command.StdoutAsLines(o, "ps", "--all", "--format", "{{.Names}}")
46-
gomega.Expect(psOutput).Should(gomega.ContainElement(containerName))
47+
gomega.Expect(psOutput).Should(gomega.ContainElement("[" + containerName + "]"))
4748

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

Diff for: go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/onsi/gomega v1.27.10
1313
github.com/pelletier/go-toml v1.9.5
1414
github.com/pkg/sftp v1.13.5
15-
github.com/runfinch/common-tests v0.7.1
15+
github.com/runfinch/common-tests v0.7.2
1616
github.com/shirou/gopsutil/v3 v3.23.7
1717
github.com/sirupsen/logrus v1.9.3
1818
github.com/spf13/afero v1.9.5

Diff for: go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -312,8 +312,8 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L
312312
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
313313
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
314314
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
315-
github.com/runfinch/common-tests v0.7.1 h1:MQP1W9n6T6OlZu32uw3efZzdztxj1F4Qa/weKf5Was0=
316-
github.com/runfinch/common-tests v0.7.1/go.mod h1:gweXGeZvwD+YZujYhe12bIXrY8bWQy/43N+GRmZM5I4=
315+
github.com/runfinch/common-tests v0.7.2 h1:LYZkxcFpcsoS4ZiXZ5l4aInncmKere+s5SB89QoJx28=
316+
github.com/runfinch/common-tests v0.7.2/go.mod h1:gweXGeZvwD+YZujYhe12bIXrY8bWQy/43N+GRmZM5I4=
317317
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
318318
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
319319
github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=

0 commit comments

Comments
 (0)