From 1b3ad94f9477eb3f8d33cbea90880f78ca403ff7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 8 Aug 2023 19:57:32 -0700 Subject: [PATCH] build(deps): Bump submodules and dependencies (#521) --- Makefile | 4 ++-- deps/finch-core | 2 +- e2e/vm/additional_disk_test.go | 3 ++- go.mod | 2 +- go.sum | 4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index b69231031..eb18a85cd 100644 --- a/Makefile +++ b/Makefile @@ -35,13 +35,13 @@ ifneq (,$(findstring arm64,$(ARCH))) LIMA_ARCH = aarch64 # From https://dl.fedoraproject.org/pub/fedora/linux/releases/37/Cloud/aarch64/images/ FINCH_OS_BASENAME ?= Fedora-Cloud-Base-38-1.6.aarch64-20230713205101.qcow2 - LIMA_URL ?= https://deps.runfinch.com/aarch64/lima-and-qemu.macos-aarch64.1689037160.tar.gz + LIMA_URL ?= https://deps.runfinch.com/aarch64/lima-and-qemu.macos-aarch64.1691201350.tar.gz else ifneq (,$(findstring x86_64,$(ARCH))) SUPPORTED_ARCH = true LIMA_ARCH = x86_64 # From https://dl.fedoraproject.org/pub/fedora/linux/releases/37/Cloud/x86_64/images/ FINCH_OS_BASENAME ?= Fedora-Cloud-Base-38-1.6.x86_64-20230713205042.qcow2 - LIMA_URL ?= https://deps.runfinch.com/x86-64/lima-and-qemu.macos-x86_64.1689037160.tar.gz + LIMA_URL ?= https://deps.runfinch.com/x86-64/lima-and-qemu.macos-x86_64.1691201350.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 index f1e9aa4c2..f69af0040 160000 --- a/deps/finch-core +++ b/deps/finch-core @@ -1 +1 @@ -Subproject commit f1e9aa4c2110c240148d65a5389a21b08213adeb +Subproject commit f69af00407df900b6ea1142b28e6a5a7ad27b5d3 diff --git a/e2e/vm/additional_disk_test.go b/e2e/vm/additional_disk_test.go index 56dc777b5..7c0dfb3c6 100644 --- a/e2e/vm/additional_disk_test.go +++ b/e2e/vm/additional_disk_test.go @@ -42,8 +42,9 @@ var testAdditionalDisk = func(o *option.Option) { imageOutput := command.StdoutAsLines(o, "images", "--format", "{{.Name}}") gomega.Expect(imageOutput).Should(gomega.ContainElement(savedImage)) + // Changed in nerdctl v1.5 to [] https://github.com/containerd/nerdctl/commit/11d80f274257c064924f40bd007756110d863a16 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)) diff --git a/go.mod b/go.mod index 136af1d65..d123877a3 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/onsi/gomega v1.27.10 github.com/pelletier/go-toml v1.9.5 github.com/pkg/sftp v1.13.5 - github.com/runfinch/common-tests v0.7.1 + github.com/runfinch/common-tests v0.7.2 github.com/shirou/gopsutil/v3 v3.23.7 github.com/sirupsen/logrus v1.9.3 github.com/spf13/afero v1.9.5 diff --git a/go.sum b/go.sum index ca8d1426e..f48c097cc 100644 --- a/go.sum +++ b/go.sum @@ -312,8 +312,8 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/runfinch/common-tests v0.7.1 h1:MQP1W9n6T6OlZu32uw3efZzdztxj1F4Qa/weKf5Was0= -github.com/runfinch/common-tests v0.7.1/go.mod h1:gweXGeZvwD+YZujYhe12bIXrY8bWQy/43N+GRmZM5I4= +github.com/runfinch/common-tests v0.7.2 h1:LYZkxcFpcsoS4ZiXZ5l4aInncmKere+s5SB89QoJx28= +github.com/runfinch/common-tests v0.7.2/go.mod h1:gweXGeZvwD+YZujYhe12bIXrY8bWQy/43N+GRmZM5I4= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=