diff --git a/Makefile b/Makefile index d1684b570..3ca10ea7f 100644 --- a/Makefile +++ b/Makefile @@ -81,8 +81,14 @@ install.finch-core-dependencies: # For Finch on macOS and Windows, the container runtime archive locations and digests are set # based on the values set in deps/finch-core/deps/container-runtime-full-archive.conf -include $(FINCH_CORE_DIR)/deps/container-runtime-full-archive.conf +ifneq ($(AARCH64_ARTIFACT_PATHING),) + AARCH64_ARTIFACT := "$(AARCH64_ARTIFACT_PATHING)/$(AARCH64_ARTIFACT)" +endif CONTAINER_RUNTIME_ARCHIVE_AARCH64_LOCATION ?= "$(ARTIFACT_BASE_URL)/$(AARCH64_ARTIFACT)" CONTAINER_RUNTIME_ARCHIVE_AARCH64_DIGEST ?= "sha256:$(AARCH64_256_DIGEST)" +ifneq ($(X86_64_ARTIFACT_PATHING),) + X86_64_ARTIFACT := "$(X86_64_ARTIFACT_PATHING)/$(X86_64_ARTIFACT)" +endif CONTAINER_RUNTIME_ARCHIVE_X86_64_LOCATION ?= "$(ARTIFACT_BASE_URL)/$(X86_64_ARTIFACT)" CONTAINER_RUNTIME_ARCHIVE_X86_64_DIGEST ?= "sha256:$(X86_64_256_DIGEST)" diff --git a/deps/finch-core b/deps/finch-core index fb8861cd1..49ebd39b0 160000 --- a/deps/finch-core +++ b/deps/finch-core @@ -1 +1 @@ -Subproject commit fb8861cd1acd7884a2e51a0a37378d885a0d6409 +Subproject commit 49ebd39b0846f77f4f6db597d59a215b60578998 diff --git a/go.mod b/go.mod index d08bf3f44..ba09fe297 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/onsi/gomega v1.36.2 github.com/pelletier/go-toml v1.9.5 github.com/pkg/sftp v1.13.7 - github.com/runfinch/common-tests v0.8.0 + github.com/runfinch/common-tests v0.9.0 github.com/shirou/gopsutil/v3 v3.24.5 github.com/sirupsen/logrus v1.9.4-0.20230606125235-dd1b4c2e81af github.com/spf13/afero v1.11.0 diff --git a/go.sum b/go.sum index 02aed8ba6..3c8e7311e 100644 --- a/go.sum +++ b/go.sum @@ -272,8 +272,8 @@ github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/rootless-containers/rootlesskit/v2 v2.3.1 h1:wdYtdKxWFvVLby9ThMP6O6/v2q/GmOXbkRi+4m9nPW0= github.com/rootless-containers/rootlesskit/v2 v2.3.1/go.mod h1:tdtfS9ak4bGmwJRmcjsAzcHN5rJ3c5dB7yhSV10KTbk= -github.com/runfinch/common-tests v0.8.0 h1:ctMpeHjUemEQaJ28EZ0oFsAxYopmhkslqQzd8pAoFYE= -github.com/runfinch/common-tests v0.8.0/go.mod h1:Kf6ofmyppurRrGGaZVj43J++fDJ2wQ2lFRg8J6YYbwM= +github.com/runfinch/common-tests v0.9.0 h1:6ncmCVfaHPdDD2mzXJTjIYBOD0MwtxJV9JkCdnCaJbQ= +github.com/runfinch/common-tests v0.9.0/go.mod h1:vkWvXw8vc4f9LQFTYT1Fc6Q4eJvrBvunx4yn5WUjpiE= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=