Upgrade mgclient and fix CI

memgraph · Aug 30, 2024 · bdfcc98 · bdfcc98
1 parent 36baafe
commit bdfcc98
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 19 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,7 +33,7 @@ jobs:
             echo "Memgraph download link is not valid"
             exit 1
           fi
-      
+
       - name: Install dependencies (Ubuntu 22.04)
         if: matrix.platform == 'ubuntu-22.04'
         run: |
@@ -43,7 +43,6 @@ jobs:
           curl -L ${{ env.MEMGRAPH_DOWNLOAD_LINK }} > ~/memgraph/memgraph_${{ matrix.mg_version }}-1_amd64.deb
           sudo systemctl mask memgraph
           sudo dpkg -i ~/memgraph/memgraph_${{ matrix.mg_version }}-1_amd64.deb
-
       - uses: actions/checkout@v4
       - name: Install and test mgconsole
         run: |
@@ -60,36 +59,40 @@ jobs:
           name: "mgconsole_ctest.log"
           path: build/Testing/Temporary/LastTest.log 
 
-  build_windows:
-    if: false
-    runs-on: windows-latest
+  build_windows_mingw:
+    runs-on: windows-2022
+    strategy:
+      matrix:
+        include: [
+          { msystem: MINGW64, arch: x86_64 }
+        ]
+    defaults:
+      run:
+        shell: msys2 {0}
     steps:
+      - name: Set-up repository
+        uses: actions/checkout@v4
       - uses: msys2/setup-msys2@v2
         with:
-          msystem: MINGW64
+          msystem: ${{ matrix.msystem }}
           update: true
-          install: git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-openssl
-      - name: Add mingw64 to PATH
-        run: |
-          # First make sure python would resolve to the windows native python, not mingw one
-          echo "C:/msys64/mingw64/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
-          echo "${{ env.pythonLocation }}" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
-      - uses: actions/checkout@v4
-      - name: Install mgconsole
+          install: >-
+            git base-devel
+            mingw-w64-${{ matrix.arch }}-toolchain
+            mingw-w64-${{ matrix.arch }}-cmake
+            mingw-w64-${{ matrix.arch }}-openssl
+      - name: Build and test mgclient
         run: |
-          $env:OPENSSL_ROOT_DIR = "C:/msys64/mingw64"
           mkdir build
           cd build
           cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release ..
-          make
+          cmake --build . --parallel
           make install
       - name: Save mgconsole Windows build
         uses: actions/upload-artifact@v4
         with:
           name: "mgconsole Windows build"
           path: build/src/mgconsole.exe
-          #ToDo(the-joksim):
-          #  - add Windows e2e test
 
   build_apple:
     strategy:

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -84,7 +84,7 @@ add_dependencies(${GFLAGS_LIBRARY} gflags-proj)
 ExternalProject_Add(mgclient-proj
   PREFIX mgclient
   GIT_REPOSITORY https://github.com/memgraph/mgclient.git
-  GIT_TAG v1.4.1
+  GIT_TAG v1.4.4
   CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>"
   "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
   "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}"