From 828b55a93275bf417d6b403c16bed55a9b1f8194 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20Bari=C5=A1i=C4=87?=
 <48765171+MarkoBarisic@users.noreply.github.com>
Date: Wed, 22 Nov 2023 00:04:58 +0100
Subject: [PATCH] Prepare mage for 1.12.1 patch release (#417)

* Prepare mage for 1.12.1 patch release

* add fix for cleaning modules

* add dockerfile cleaning

* fix failling test

* revert setup script

* revert setup completely

* fix loading of csv utils module

---------

Co-authored-by: antoniofilipovic <filipovicantonio1998@gmail.com>
---
 .github/workflows/docker_publish.yml                      | 2 +-
 .github/workflows/test.yml                                | 2 +-
 Dockerfile                                                | 2 +-
 Dockerfile.cugraph                                        | 2 +-
 Dockerfile.release                                        | 6 +++++-
 cpp/csv_utils_module/csv_utils_module.cpp                 | 2 ++
 cpp/memgraph                                              | 2 +-
 e2e/node_similarity_test/test_list_list_cosine_c/test.yml | 2 +-
 setup                                                     | 1 -
 9 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/docker_publish.yml b/.github/workflows/docker_publish.yml
index a58981eb6..d6dca0649 100644
--- a/.github/workflows/docker_publish.yml
+++ b/.github/workflows/docker_publish.yml
@@ -12,7 +12,7 @@ jobs:
     env:
       DOCKER_ORGANIZATION_NAME: memgraph
       DOCKER_REPOSITORY_NAME: memgraph-mage
-      MEMGRAPH_VERSION: 2.12.0
+      MEMGRAPH_VERSION: 2.12.1
     steps:            
       - name: Checkout repository and submodules
         uses: actions/checkout@v3
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3b43768d5..c4967e553 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: True
     env:
-      MEMGRAPH_VERSION: 2.12.0
+      MEMGRAPH_VERSION: 2.12.1
     strategy:
       matrix:
         architecture: ["amd64", "arm64"]
diff --git a/Dockerfile b/Dockerfile
index 58357e48f..fbb9e7808 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ FROM debian:bullseye as base
 
 USER root
 
-ARG MG_VERSION=2.12.0
+ARG MG_VERSION=2.12.1
 ARG PY_VERSION_DEFAULT
 ENV MG_VERSION ${MG_VERSION}
 ENV PY_VERSION ${PY_VERSION_DEFAULT}
diff --git a/Dockerfile.cugraph b/Dockerfile.cugraph
index a59def910..a374d06a7 100644
--- a/Dockerfile.cugraph
+++ b/Dockerfile.cugraph
@@ -2,7 +2,7 @@ ARG CUGRAPH_VERSION=22.02
 ARG CUDA_VERSION=11.5
 ARG CUDA_VERSION_MINOR=11.5.2
 ARG PY_VERSION=3.8
-ARG MG_VERSION=2.12.0
+ARG MG_VERSION=2.12.1
 
 FROM rapidsai/rapidsai:${CUGRAPH_VERSION}-cuda${CUDA_VERSION}-runtime-ubuntu20.04-py${PY_VERSION} as cugraph-dev
 
diff --git a/Dockerfile.release b/Dockerfile.release
index 444d9f404..e5f0e85fc 100644
--- a/Dockerfile.release
+++ b/Dockerfile.release
@@ -30,7 +30,11 @@ RUN apt-get update && apt-get install -y \
 
 COPY memgraph-${TARGETARCH}.deb .
 
-RUN dpkg -i memgraph-${TARGETARCH}.deb && rm memgraph-${TARGETARCH}.deb
+# Hack to remove modules that cause error on loading of torch modules
+# Must be here due to multi-phase build. The setup script is in dev phase
+# whereas we unpack memgraph in the base phase
+RUN dpkg -i memgraph-${TARGETARCH}.deb && rm memgraph-${TARGETARCH}.deb && rm /usr/lib/memgraph/query_modules/schema.so  \
+&& rm /usr/lib/memgraph/query_modules/example_cpp.so
 
 ENV LD_LIBRARY_PATH /usr/lib/memgraph/query_modules
 
diff --git a/cpp/csv_utils_module/csv_utils_module.cpp b/cpp/csv_utils_module/csv_utils_module.cpp
index 022275efd..1b5eb94a3 100644
--- a/cpp/csv_utils_module/csv_utils_module.cpp
+++ b/cpp/csv_utils_module/csv_utils_module.cpp
@@ -23,3 +23,5 @@ extern "C" int mgp_init_module(mgp_module *module, mgp_memory *memory) {
   }
   return 0;
 }
+
+extern "C" int mgp_shutdown_module() { return 0; }
diff --git a/cpp/memgraph b/cpp/memgraph
index b2de962a3..da9d6dd8e 160000
--- a/cpp/memgraph
+++ b/cpp/memgraph
@@ -1 +1 @@
-Subproject commit b2de962a3f2d4962978c471d245a1ce05d7ff139
+Subproject commit da9d6dd8e13db91e1c6657270da0a612c4befab4
diff --git a/e2e/node_similarity_test/test_list_list_cosine_c/test.yml b/e2e/node_similarity_test/test_list_list_cosine_c/test.yml
index 90554aa0b..40296f6f4 100644
--- a/e2e/node_similarity_test/test_list_list_cosine_c/test.yml
+++ b/e2e/node_similarity_test/test_list_list_cosine_c/test.yml
@@ -1,6 +1,6 @@
 query: >
         MATCH (m)
-        WHERE m.id > 2 AND m.id < 5
+        WHERE m.id > 0 AND m.id < 2
         WITH collect(m) as nodes1
 
         MATCH (n)
diff --git a/setup b/setup
index bd30b7241..1ce521843 100644
--- a/setup
+++ b/setup
@@ -336,7 +336,6 @@ def build(args: Dict[str, Any]) -> bool:
 
     return True
 
-
 def run_build_action(args: Dict[str, Any]) -> bool:
     logger.info("[Terminal] Starting building and copying source code...")
     status = build(args)