From 47d38cec35977b89e8be2f3cc95256f73284c271 Mon Sep 17 00:00:00 2001 From: Justin Alvarez Date: Thu, 24 Aug 2023 17:08:31 -0400 Subject: [PATCH 1/8] fix: e2e tests Signed-off-by: Justin Alvarez --- e2e/e2e_test.go | 2 +- e2e/fedora.yaml | 191 -------------------------------------- lima-template/fedora.yaml | 150 ++++++++++++++++-------------- 3 files changed, 81 insertions(+), 262 deletions(-) delete mode 100644 e2e/fedora.yaml diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go index e51f502b..874ee413 100644 --- a/e2e/e2e_test.go +++ b/e2e/e2e_test.go @@ -38,7 +38,7 @@ func TestE2e(t *testing.T) { t.Fatalf("failed to get the current working directory: %v", err) } subject := "limactl" - vmConfigFile := filepath.Join(wd, "./fedora.yaml") + vmConfigFile := filepath.Join(wd, "./../lima-template/fedora.yaml") vmName := "fedora" o, err := option.New([]string{subject}) diff --git a/e2e/fedora.yaml b/e2e/fedora.yaml deleted file mode 100644 index d1bd62f2..00000000 --- a/e2e/fedora.yaml +++ /dev/null @@ -1,191 +0,0 @@ -# ===================================================================== # -# BASIC CONFIGURATION -# ===================================================================== # - -# Default values in this YAML file are specified by `null` instead of Lima's "builtin default" values, -# so they can be overridden by the $LIMA_HOME/_config/default.yaml mechanism documented at the end of this file. - -# Arch: "default", "x86_64", "aarch64". -# 🟢 Builtin default: "default" (corresponds to the host architecture) -arch: null - -# OpenStack-compatible disk image. -# 🟢 Builtin default: null (must be specified) -# 🔵 This file: Ubuntu 22.04 Jammy Jellyfish images -images: - - location: "https://deps.runfinch.com/Fedora-Cloud-Base-37-1.7.x86_64-20230329185717.qcow2" - arch: "x86_64" - digest: "sha256:df67925e051ace602f58b1e01ed65156c975b985be1c0b24dd62f63d28d076d4" - - location: "https://deps.runfinch.com/Fedora-Cloud-Base-37-1.7.aarch64-20230330181518.qcow2" - arch: "aarch64" - digest: "sha256:0951ee1a69817e2ef472163af752bf4efb25486659308d22d9e72ca9b45a097f" - -# CPUs: if you see performance issues, try limiting cpus to 1. -# 🟢 Builtin default: 4 -cpus: null - -# Memory size -# 🟢 Builtin default: "4GiB" -memory: "4GiB" - -# Disk size -# 🟢 Builtin default: "100GiB" -disk: null - -# Expose host directories to the guest, the mount point might be accessible from all UIDs in the guest -# 🟢 Builtin default: null (Mount nothing) -# 🔵 This file: Mount the home as read-only, /tmp/lima as writable -mounts: - - location: "~" - # Configure the mountPoint inside the guest. - # 🟢 Builtin default: value of location - mountPoint: null - # CAUTION: `writable` SHOULD be false for the home directory. - # Setting `writable` to true is safe for finch use case. - # Reference: https://github.com/lima-vm/lima/discussions/550 - writable: true - sshfs: - # Enabling the SSHFS cache will increase performance of the mounted filesystem, at - # the cost of potentially not reflecting changes made on the host in a timely manner. - # Warning: It looks like PHP filesystem access does not work correctly when - # the cache is disabled. - # 🟢 Builtin default: true - cache: null - # SSHFS has an optional flag called 'follow_symlinks'. This allows mounts - # to be properly resolved in the guest os and allow for access to the - # contents of the symlink. As a result, symlinked files & folders on the Host - # system will look and feel like regular files directories in the Guest OS. - # 🟢 Builtin default: false - followSymlinks: null - # SFTP driver, "builtin" or "openssh-sftp-server". "openssh-sftp-server" is recommended. - # 🟢 Builtin default: "openssh-sftp-server" if OpenSSH SFTP Server binary is found, otherwise "builtin" - sftpDriver: null - 9p: - # Supported security models are "passthrough", "mapped-xattr", "mapped-file" and "none". - # 🟢 Builtin default: "mapped-xattr" - securityModel: null - # Select 9P protocol version. Valid options are: "9p2000" (legacy), "9p2000.u", "9p2000.L". - # 🟢 Builtin default: "9p2000.L" - protocolVersion: null - # The number of bytes to use for 9p packet payload, where 4KiB is the absolute minimum. - # 🟢 Builtin default: "128KiB" - msize: null - # Specifies a caching policy. Valid options are: "none", "loose", "fscache" and "mmap". - # Try choosing "mmap" or "none" if you see a stability issue with the default "fscache". - # See https://www.kernel.org/doc/Documentation/filesystems/9p.txt - # 🟢 Builtin default: "fscache" for non-writable mounts, "mmap" for writable mounts - cache: null - - location: "/tmp/lima" - # 🟢 Builtin default: false - # 🔵 This file: true (only for "/tmp/lima") - writable: true - -# Mount type for above mounts, such as "reverse-sshfs" (from sshocker) or "9p" (EXPERIMENTAL, from QEMU’s virtio-9p-pci, aka virtfs) -# 🟢 Builtin default: "reverse-sshfs" -mountType: reverse-sshfs - -ssh: - # A localhost port of the host. Forwarded to port 22 of the guest. - # 🟢 Builtin default: 0 (automatically assigned to a free port) - # NOTE: when the instance name is "default", the builtin default value is set to - # 60022 for backward compatibility. - localPort: 0 - # Load ~/.ssh/*.pub in addition to $LIMA_HOME/_config/user.pub . - # This option is useful when you want to use other SSH-based - # applications such as rsync with the Lima instance. - # If you have an insecure key under ~/.ssh, do not use this option. - # 🟢 Builtin default: true - loadDotSSHPubKeys: false - # Forward ssh agent into the instance. - # 🟢 Builtin default: false - forwardAgent: null - # Forward X11 into the instance - # 🟢 Builtin default: false - forwardX11: null - # Trust forwarded X11 clients - # 🟢 Builtin default: false - forwardX11Trusted: null - -# ===================================================================== # -# ADVANCED CONFIGURATION -# ===================================================================== # - -containerd: - # Enable system-wide (aka rootful) containerd and its dependencies (BuildKit, Stargz Snapshotter) - # 🟢 Builtin default: false - system: true - # Enable user-scoped (aka rootless) containerd and its dependencies - # 🟢 Builtin default: true - user: false -# # Override containerd archive -# # 🟢 Builtin default: hard-coded URL with hard-coded digest (see the output of `limactl info | jq .defaultTemplate.containerd.archives`) -# archives: -# - location: "~/Downloads/nerdctl-full-X.Y.Z-linux-amd64.tar.gz" -# arch: "x86_64" -# digest: "sha256:..." - -# Provisioning scripts need to be idempotent because they might be called -# multiple times, e.g. when the host VM is being restarted. -# 🟢 Builtin default: null -provision: - # Install packages needed for QEMU user-mode emulation - - mode: system - script: | - #!/bin/bash - dnf install -y --setopt=install_weak_deps=False qemu-user-static-aarch64 qemu-user-static-arm qemu-user-static-x86 - - mode: boot - script: | - systemctl stop NetworkManager-wait-online.service - systemctl reset-failed NetworkManager-wait-online.service - systemctl mask NetworkManager-wait-online.service - # # `user` is executed without the root privilege - - mode: user - script: | - #!/bin/bash - - # Enable SSHing into the VM as root (e.g., in `nerdctlConfigApplier.Apply`). - sudo cp ~/.ssh/authorized_keys /root/.ssh/ - sudo chown $USER /mnt/lima-finch - sudo systemctl restart containerd.service - -# Probe scripts to check readiness. -# 🟢 Builtin default: null -# probes: -# # Only `readiness` probes are supported right now. -# - mode: readiness -# description: vim to be installed -# script: | -# #!/bin/bash -# set -eux -o pipefail -# if ! timeout 30s bash -c "until command -v vim; do sleep 3; done"; then -# echo >&2 "vim is not installed yet" -# exit 1 -# fi -# hint: | -# vim was not installed in the guest. Make sure the package system is working correctly. -# Also see "/var/log/cloud-init-output.log" in the guest. - -# ===================================================================== # -# FURTHER ADVANCED CONFIGURATION -# ===================================================================== # - -# Specify desired QEMU CPU type for each arch. -# You can see what options are available for host emulation with: `qemu-system-$(arch) -cpu help`. -# Setting of instructions is supported like this: "qemu64,+ssse3". -cpuType: - # 🟢 Builtin default: "cortex-a72" (or "host" when running on aarch64 host) - aarch64: null - # 🟢 Builtin default: "qemu64" (or "host" when running on x86_64 host) - x86_64: null - -firmware: - # Use legacy BIOS instead of UEFI. Ignored for aarch64. - # 🟢 Builtin default: false - legacyBIOS: null - -video: - # QEMU display, e.g., "none", "cocoa", "sdl", "gtk". - # As of QEMU v6.2, enabling this is known to have negative impact - # on performance on macOS hosts: https://gitlab.com/qemu-project/qemu/-/issues/334 - # 🟢 Builtin default: "none" - display: null diff --git a/lima-template/fedora.yaml b/lima-template/fedora.yaml index 14b1f194..00c0ecf2 100644 --- a/lima-template/fedora.yaml +++ b/lima-template/fedora.yaml @@ -33,53 +33,54 @@ disk: null # 🟢 Builtin default: null (Mount nothing) # 🔵 This file: Mount the home as read-only, /tmp/lima as writable mounts: - - location: "~" - # Configure the mountPoint inside the guest. - # 🟢 Builtin default: value of location - mountPoint: null - # CAUTION: `writable` SHOULD be false for the home directory. - # Setting `writable` to true is possible, but untested and dangerous. +- location: "~" + # Configure the mountPoint inside the guest. + # 🟢 Builtin default: value of location + mountPoint: null + # CAUTION: `writable` SHOULD be false for the home directory. + # Setting `writable` to true is safe for finch use case. + # Reference: https://github.com/lima-vm/lima/discussions/550 + writable: true + sshfs: + # Enabling the SSHFS cache will increase performance of the mounted filesystem, at + # the cost of potentially not reflecting changes made on the host in a timely manner. + # Warning: It looks like PHP filesystem access does not work correctly when + # the cache is disabled. + # 🟢 Builtin default: true + cache: null + # SSHFS has an optional flag called 'follow_symlinks'. This allows mounts + # to be properly resolved in the guest os and allow for access to the + # contents of the symlink. As a result, symlinked files & folders on the Host + # system will look and feel like regular files directories in the Guest OS. # 🟢 Builtin default: false - writable: null - sshfs: - # Enabling the SSHFS cache will increase performance of the mounted filesystem, at - # the cost of potentially not reflecting changes made on the host in a timely manner. - # Warning: It looks like PHP filesystem access does not work correctly when - # the cache is disabled. - # 🟢 Builtin default: true - cache: null - # SSHFS has an optional flag called 'follow_symlinks'. This allows mounts - # to be properly resolved in the guest os and allow for access to the - # contents of the symlink. As a result, symlinked files & folders on the Host - # system will look and feel like regular files directories in the Guest OS. - # 🟢 Builtin default: false - followSymlinks: null - # SFTP driver, "builtin" or "openssh-sftp-server". "openssh-sftp-server" is recommended. - # 🟢 Builtin default: "openssh-sftp-server" if OpenSSH SFTP Server binary is found, otherwise "builtin" - sftpDriver: null - 9p: - # Supported security models are "passthrough", "mapped-xattr", "mapped-file" and "none". - # 🟢 Builtin default: "mapped-xattr" - securityModel: null - # Select 9P protocol version. Valid options are: "9p2000" (legacy), "9p2000.u", "9p2000.L". - # 🟢 Builtin default: "9p2000.L" - protocolVersion: null - # The number of bytes to use for 9p packet payload, where 4KiB is the absolute minimum. - # 🟢 Builtin default: "128KiB" - msize: null - # Specifies a caching policy. Valid options are: "none", "loose", "fscache" and "mmap". - # Try choosing "mmap" or "none" if you see a stability issue with the default "fscache". - # See https://www.kernel.org/doc/Documentation/filesystems/9p.txt - # 🟢 Builtin default: "fscache" for non-writable mounts, "mmap" for writable mounts - cache: null - - location: "/tmp/lima" - # 🟢 Builtin default: false - # 🔵 This file: true (only for "/tmp/lima") - writable: true - -# Mount type for above mounts, such as "reverse-sshfs" (from sshocker) or "9p" (EXPERIMENTAL, from QEMU’s virtio-9p-pci, aka virtfs) -# 🟢 Builtin default: "reverse-sshfs" -mountType: reverse-sshfs + followSymlinks: null + # SFTP driver, "builtin" or "openssh-sftp-server". "openssh-sftp-server" is recommended. + # 🟢 Builtin default: "openssh-sftp-server" if OpenSSH SFTP Server binary is found, otherwise "builtin" + sftpDriver: null + 9p: + # Supported security models are "passthrough", "mapped-xattr", "mapped-file" and "none". + # 🟢 Builtin default: "mapped-xattr" + securityModel: null + # Select 9P protocol version. Valid options are: "9p2000" (legacy), "9p2000.u", "9p2000.L". + # 🟢 Builtin default: "9p2000.L" + protocolVersion: null + # The number of bytes to use for 9p packet payload, where 4KiB is the absolute minimum. + # 🟢 Builtin default: "128KiB" + msize: null + # Specifies a caching policy. Valid options are: "none", "loose", "fscache" and "mmap". + # Try choosing "mmap" or "none" if you see a stability issue with the default "fscache". + # See https://www.kernel.org/doc/Documentation/filesystems/9p.txt + # 🟢 Builtin default: "fscache" for non-writable mounts, "mmap" for writable mounts + cache: null +- location: "/tmp/lima" + # 🟢 Builtin default: false + # 🔵 This file: true (only for "/tmp/lima") + writable: true +- location: "/var/folders" + writable: true +# Because readlink /var => private/var +- location: "/private/var/folders" + writable: true ssh: # A localhost port of the host. Forwarded to port 22 of the guest. @@ -92,7 +93,7 @@ ssh: # applications such as rsync with the Lima instance. # If you have an insecure key under ~/.ssh, do not use this option. # 🟢 Builtin default: true - loadDotSSHPubKeys: null + loadDotSSHPubKeys: false # Forward ssh agent into the instance. # 🟢 Builtin default: false forwardAgent: null @@ -110,10 +111,10 @@ ssh: containerd: # Enable system-wide (aka rootful) containerd and its dependencies (BuildKit, Stargz Snapshotter) # 🟢 Builtin default: false - system: null + system: true # Enable user-scoped (aka rootless) containerd and its dependencies # 🟢 Builtin default: true - user: null + user: false # # Override containerd archive # # 🟢 Builtin default: hard-coded URL with hard-coded digest (see the output of `limactl info | jq .defaultTemplate.containerd.archives`) # archives: @@ -125,20 +126,37 @@ containerd: # multiple times, e.g. when the host VM is being restarted. # 🟢 Builtin default: null provision: - # # `system` is executed with the root privilege - - mode: system - script: | - #!/bin/bash - systemctl reset-failed NetworkManager-wait-online.service - rm -rf /etc/systemd/system/network-online.target.wants/ +- mode: boot + script: | + systemctl stop NetworkManager-wait-online.service + systemctl reset-failed NetworkManager-wait-online.service + systemctl mask NetworkManager-wait-online.service +- mode: boot + script: | + modprobe virtiofs +- mode: boot + script: | + modprobe br_netfilter + cat < /etc/sysctl.d/99-finch.conf + net.bridge.bridge-nf-call-iptables = 1 + net.bridge.bridge-nf-call-ip6tables = 1 + net.ipv4.ip_forward = 1 + EOF + sysctl --system +- mode: system + script: | + #!/bin/bash + dnf install -y --setopt=install_weak_deps=False qemu-user-static-aarch64 qemu-user-static-arm qemu-user-static-x86 # # `user` is executed without the root privilege -# - mode: user -# script: | -# #!/bin/bash -# set -eux -o pipefail -# cat < ~/.vimrc -# set number -# EOF +- mode: user + script: | + #!/bin/bash + + # Enable SSHing into the VM as root (e.g., in `nerdctlConfigApplier.Apply`). + sudo cp ~/.ssh/authorized_keys /root/.ssh/ + sudo chown $USER /mnt/lima-finch + sudo systemctl add-requires buildkit.service containerd.service + sudo systemctl restart containerd.service # Probe scripts to check readiness. # 🟢 Builtin default: null @@ -157,14 +175,6 @@ provision: # vim was not installed in the guest. Make sure the package system is working correctly. # Also see "/var/log/cloud-init-output.log" in the guest. -# By default, Lima does not persist user data when the VM image is upgraded. In -# order to enable that, we can attach an external data volume and mount user data onto -# it, and install it between OS upgrades. To use this feature, set saveUserData to -# "true". By default, the attached data volume will be the same size as the disk -# configuration above. -# 🟢 Builtin default: false -saveUserData: true - # ===================================================================== # # FURTHER ADVANCED CONFIGURATION # ===================================================================== # From 7b72667fad62dcc088a6c4a3d10f915d34db0396 Mon Sep 17 00:00:00 2001 From: Justin Alvarez Date: Thu, 24 Aug 2023 17:15:02 -0400 Subject: [PATCH 2/8] update ci workflow Signed-off-by: Justin Alvarez --- .github/workflows/ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 72838320..85544c37 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -51,5 +51,6 @@ jobs: which libtool # Install socket_vmnet to `_output/bin` which is used in $PATH SOCKET_VMNET_TEMP_PREFIX=$(pwd)/_output/ make lima-socket-vmnet + make lima-template make install.lima-dependencies - run: make test-e2e From 52310102c7eea912fcbabebf58024b9da8b0475f Mon Sep 17 00:00:00 2001 From: Justin Alvarez Date: Thu, 24 Aug 2023 17:18:27 -0400 Subject: [PATCH 3/8] fix path Signed-off-by: Justin Alvarez --- e2e/e2e_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go index 874ee413..eef00c53 100644 --- a/e2e/e2e_test.go +++ b/e2e/e2e_test.go @@ -38,7 +38,7 @@ func TestE2e(t *testing.T) { t.Fatalf("failed to get the current working directory: %v", err) } subject := "limactl" - vmConfigFile := filepath.Join(wd, "./../lima-template/fedora.yaml") + vmConfigFile := filepath.Join(wd, "./../_output/lima-template/fedora.yaml") vmName := "fedora" o, err := option.New([]string{subject}) From 1a379aac9e08da8dc6fe30373538b2297f6fd08a Mon Sep 17 00:00:00 2001 From: Justin Alvarez Date: Thu, 24 Aug 2023 17:25:52 -0400 Subject: [PATCH 4/8] update make target Signed-off-by: Justin Alvarez --- .github/workflows/ci.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 85544c37..5b864c51 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -51,6 +51,5 @@ jobs: which libtool # Install socket_vmnet to `_output/bin` which is used in $PATH SOCKET_VMNET_TEMP_PREFIX=$(pwd)/_output/ make lima-socket-vmnet - make lima-template - make install.lima-dependencies + make binaries - run: make test-e2e From 03dbdc9b1804081bd123d59224e78a266a969fcb Mon Sep 17 00:00:00 2001 From: Justin Alvarez Date: Thu, 24 Aug 2023 17:30:06 -0400 Subject: [PATCH 5/8] install dependencies Signed-off-by: Justin Alvarez --- .github/workflows/ci.yaml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5b864c51..2378ebc7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -26,16 +26,19 @@ jobs: os: [[self-hosted, macos, amd64, 13, test], [self-hosted, macos, amd64, 12, test], [self-hosted, macos, arm64, 13, test], [self-hosted, macos, arm64, 12, test]] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - name: Checkout code + uses: actions/checkout@v3 with: fetch-depth: 0 persist-credentials: false submodules: true - - uses: actions/setup-go@v4 + - name: Setup go + uses: actions/setup-go@v4 with: go-version-file: e2e/go.mod cache: true - name: Clean up previous files + shell: zsh {0} run: | sudo rm -rf ~/.lima sudo rm -rf ./_output @@ -45,11 +48,17 @@ jobs: if pgrep '^socket_vmnet'; then sudo pkill '^socket_vmnet' fi + - name: Install dependencies + shell: zsh {0} + run: brew install go lz4 automake autoconf libtool - name: Build project + shell: zsh {0} run: | export PATH="/opt/homebrew/opt/libtool/libexec/gnubin:$PATH" which libtool # Install socket_vmnet to `_output/bin` which is used in $PATH SOCKET_VMNET_TEMP_PREFIX=$(pwd)/_output/ make lima-socket-vmnet make binaries - - run: make test-e2e + - name: Run e2e tests + shell: zsh {0} + run: make test-e2e From a9c76dd0a6451d31780d043ff84bd62092ef31e0 Mon Sep 17 00:00:00 2001 From: Justin Alvarez Date: Thu, 24 Aug 2023 17:57:50 -0400 Subject: [PATCH 6/8] install lima.dependencies Signed-off-by: Justin Alvarez --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2378ebc7..1220130c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -58,7 +58,7 @@ jobs: which libtool # Install socket_vmnet to `_output/bin` which is used in $PATH SOCKET_VMNET_TEMP_PREFIX=$(pwd)/_output/ make lima-socket-vmnet - make binaries + make install.lima-dependencies binaries - name: Run e2e tests shell: zsh {0} run: make test-e2e From 73fdbc9ecc008cf2e1b17518edff1b384e963a44 Mon Sep 17 00:00:00 2001 From: Justin Alvarez Date: Thu, 24 Aug 2023 18:05:08 -0400 Subject: [PATCH 7/8] update common-tests Signed-off-by: Justin Alvarez --- e2e/go.mod | 2 +- e2e/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/e2e/go.mod b/e2e/go.mod index 9df6ef55..1a09bae8 100644 --- a/e2e/go.mod +++ b/e2e/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/onsi/ginkgo/v2 v2.11.0 github.com/onsi/gomega v1.27.10 - github.com/runfinch/common-tests v0.7.1 + github.com/runfinch/common-tests v0.7.2 ) require ( diff --git a/e2e/go.sum b/e2e/go.sum index 442d9e70..1b304341 100644 --- a/e2e/go.sum +++ b/e2e/go.sum @@ -20,8 +20,8 @@ github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= From 134891ea7062604657850196727795563197c205 Mon Sep 17 00:00:00 2001 From: Justin Alvarez Date: Thu, 24 Aug 2023 18:50:26 -0400 Subject: [PATCH 8/8] fix dependency caching Signed-off-by: Justin Alvarez --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1220130c..5ca5a75e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -36,7 +36,7 @@ jobs: uses: actions/setup-go@v4 with: go-version-file: e2e/go.mod - cache: true + cache-dependency-path: e2e/go.sum - name: Clean up previous files shell: zsh {0} run: |