Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/reusable_package_mage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -250,9 +250,9 @@ jobs:
- name: Build docker image
run: |
if [[ "${{ inputs.arch }}" == "arm64" ]]; then
MGBUILD_IMAGE=memgraph/mgbuild:v6_ubuntu-24.04-arm
MGBUILD_IMAGE=memgraph/mgbuild:v7_ubuntu-24.04-arm
else
MGBUILD_IMAGE=memgraph/mgbuild:v6_ubuntu-24.04
MGBUILD_IMAGE=memgraph/mgbuild:v7_ubuntu-24.04
fi

echo "Using base image: $MGBUILD_IMAGE"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/reusable_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,9 @@ jobs:
- name: Build and run Memgraph MAGE
run: |
if [[ "${{ inputs.arch }}" == "arm64" ]]; then
MGBUILD_IMAGE=memgraph/mgbuild:v6_ubuntu-24.04-arm
MGBUILD_IMAGE=memgraph/mgbuild:v7_ubuntu-24.04-arm
else
MGBUILD_IMAGE=memgraph/mgbuild:v6_ubuntu-24.04
MGBUILD_IMAGE=memgraph/mgbuild:v7_ubuntu-24.04
fi

# target is always "prod" now, we convert to dev container afterwards
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.release
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ RUN python3 -m pip install --no-cache-dir -r /mage/python/requirements.txt --bre

# Build query modules
SHELL ["/bin/bash", "-c"]
RUN source /opt/toolchain-v6/activate && curl https://sh.rustup.rs -sSf | sh -s -- -y \
RUN source /opt/toolchain-v7/activate && curl https://sh.rustup.rs -sSf | sh -s -- -y \
&& export PATH="$HOME/.cargo/bin:${PATH}" \
&& rustup toolchain install 1.85 \
&& rustup default 1.85 \
Expand Down
6 changes: 3 additions & 3 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ ExternalProject_Add(gtest-proj
PREFIX ${GTEST_ROOT}
INSTALL_DIR ${GTEST_ROOT}
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG release-1.11.0
GIT_TAG v1.16.0
CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>"
"-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}"
"-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
Expand Down Expand Up @@ -78,7 +78,7 @@ ExternalProject_Add(mgclient-proj
PREFIX ${MGCLIENT_ROOT}
INSTALL_DIR ${MGCLIENT_ROOT}
GIT_REPOSITORY https://github.com/memgraph/mgclient.git
GIT_TAG v1.4.2
GIT_TAG v1.4.3
CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>"
"-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
"-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}"
Expand All @@ -102,7 +102,7 @@ target_include_directories(mg_utility INTERFACE ${CMAKE_SOURCE_DIR}/memgraph/inc

FetchContent_Declare(fmt
GIT_REPOSITORY https://github.com/fmtlib/fmt.git
GIT_TAG 9.1.0
GIT_TAG 11.2.0
)
FetchContent_MakeAvailable(fmt)

Expand Down
2 changes: 1 addition & 1 deletion make-dev-container.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ get_toolchain_url() {
}


toolchain_version=6
toolchain_version=7
TOOLCHAIN_URL=$(get_toolchain_url "$toolchain_version")
echo "Downloading toolchain from: $TOOLCHAIN_URL"
# Download the toolchain using curl
Expand Down