Skip to content
Merged
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
42 changes: 32 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,36 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Set-up repository
uses: actions/checkout@v4
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
- name: Install environment
run: |
sudo apt install -y clang-format
- name: Run clang formatter
run: |
./tool/format.sh

abi_check:
if: ${{ github.event_name == 'push' || github.event_name == 'pull_request' }}
runs-on: ubuntu-latest
steps:
- name: Set-up repository
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
- name: Install environment
# build-essential, cmake, binutils (readelf) and python3 are preinstalled
# on the ubuntu-latest runner; only abigail-tools and pytest are missing.
# libssl-dev is kept explicit because the build does
# find_package(OpenSSL REQUIRED). python3-pytest avoids a pip install on
# the runner's externally-managed Python.
run: |
sudo apt-get update
sudo apt-get install -y --no-install-recommends abigail-tools libssl-dev python3-pytest
- name: Test the policy core
run: |
python3 -m pytest tool/ -q
- name: Check ABI vs versioning
run: |
python3 ./tool/abicheck.py --ci

build_and_test_apple:
if: ${{ github.event_name == 'pull_request' || (github.event_name == 'workflow_dispatch' && inputs.apple) }}
strategy:
Expand All @@ -48,7 +70,7 @@ jobs:
runs-on: ${{ matrix.platform }}
steps:
- name: Set-up repository
uses: actions/checkout@v4
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
# NOTE: CI can't execute end2end tests because there is no way to run
# Memgraph on CI MacOS machines.
- name: Build and test mgclient
Expand All @@ -74,9 +96,9 @@ jobs:
deps: "openssl:x64-windows"
steps:
- name: Set-up repository
uses: actions/checkout@v4
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
- name: Restore vcpkg and its artifacts
uses: actions/cache@v4
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
id: vcpkg-cache
with:
path: ${{ env.VCPKG_ROOT }}
Expand Down Expand Up @@ -116,10 +138,10 @@ jobs:
MEMGRAPH_NETWORK: "host"
steps:
- name: Set-up repository
uses: actions/checkout@v4
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0

- name: Log in to Docker Hub
uses: docker/login-action@v3
uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
Expand Down Expand Up @@ -286,13 +308,13 @@ jobs:
shell: msys2 {0}
steps:
- name: Set-up repository
uses: actions/checkout@v4
- uses: msys2/setup-msys2@v2
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
- uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # v2.32.0
with:
msystem: ${{ matrix.msystem }}
update: true
install: git base-devel mingw-w64-${{ matrix.arch }}-toolchain mingw-w64-${{ matrix.arch }}-cmake mingw-w64-${{ matrix.arch }}-openssl
- uses: Vampire/setup-wsl@v5
- uses: Vampire/setup-wsl@d1da7f2c0322a5ee4f24975344f67fc0f5baf364 # v7.0.0
with:
distribution: Ubuntu-24.04
- name: Set Memgraph Version
Expand Down Expand Up @@ -348,7 +370,7 @@ jobs:
runs-on: ${{ matrix.platform }}
steps:
- name: Set-up repository
uses: actions/checkout@v4
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0

- name: Build with clang
run: |
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@ html/

# emsdk folder pulled from wasm/install_deps.sh
wasm/emsdk

# Python bytecode cache (tool/*.py)
__pycache__/
*.pyc
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if(WASM)
set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/wasm/emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake")
endif()

project(mgclient VERSION 1.6.0)
project(mgclient VERSION 1.7.0)
Comment thread
mattkjames7 marked this conversation as resolved.
# Minor version increase can also mean ABI incompatibility with previous
# versions. IMPORTANT: Take care of the SO version manually.
set(mgclient_SOVERSION 2)
Expand Down
Loading
Loading