From bd5764d231512082caed6816c48103669d1a4f5c Mon Sep 17 00:00:00 2001 From: Tianyu Qi Date: Mon, 10 Feb 2025 08:33:52 +0000 Subject: [PATCH 1/2] feat(docker): Move dependency from Faasm to ScalaSSC As title. --- .gitmodules | 6 +++--- Dockerfile | 4 ++-- VERSION | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 197ba36..425dc42 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,11 +1,11 @@ [submodule "third-party/cpython"] path = third-party/cpython - url = https://github.com/faasm/cpython + url = https://github.com/ScalaSSC/cpython branch = faasm [submodule "third-party/crossenv"] path = third-party/crossenv - url = https://github.com/faasm/crossenv + url = https://github.com/ScalaSSC/crossenv branch = faasm [submodule "third-party/cpp"] path = third-party/cpp - url = https://github.com/faasm/cpp + url = https://github.com/ScalaSSC/cpp diff --git a/Dockerfile b/Dockerfile index 191a1f4..edbbd11 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM faasm.azurecr.io/cpp-sysroot:0.4.0 +FROM tqiunimelb/cpp-sysroot:0.0.1 ARG FAASM_PYTHON_VERSION SHELL ["/bin/bash", "-c"] @@ -10,7 +10,7 @@ RUN apt update && apt install -y libssl-dev RUN mkdir -p /code \ && git clone \ -b v${FAASM_PYTHON_VERSION} \ - https://github.com/faasm/python \ + https://github.com/ScalaSSC/python \ /code/python \ && cd /code/python \ && git submodule update --init -f third-party/cpp \ diff --git a/VERSION b/VERSION index 1d0ba9e..8acdd82 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.4.0 +0.0.1 From e7b2d957cff0c856ef7e91421b243f8b4bb3f73a Mon Sep 17 00:00:00 2001 From: Tianyu Qi Date: Sat, 15 Feb 2025 03:14:11 +0000 Subject: [PATCH 2/2] fix(cpp): update cpp link to scalassc As title. --- third-party/cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third-party/cpp b/third-party/cpp index d9fc3ac..4bc2d2b 160000 --- a/third-party/cpp +++ b/third-party/cpp @@ -1 +1 @@ -Subproject commit d9fc3acfaa96caebbe585389af79d5e7c0959c90 +Subproject commit 4bc2d2b5ea6c6553b07ea8614d88a5f34cb0fbeb