Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Point to Core 14.8.0
Browse files Browse the repository at this point in the history
leemaguire committed Jun 4, 2024
1 parent 9cb0ae2 commit 19bd6ec
Showing 3 changed files with 5 additions and 71 deletions.
72 changes: 3 additions & 69 deletions .github/workflows/vcpkg.yml
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@ jobs:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
unix-dynamic-linkage: ["-dynamic", ""]
windows-linkage: ["-DVCPKG_TARGET_TRIPLET=x64-windows-static -DENABLE_STATIC=ON", "-DVCPKG_TARGET_TRIPLET=x64-windows"]
build_type: [Debug, Release]

steps:
@@ -67,7 +68,7 @@ jobs:
working-directory: ./tests
if: matrix.os == 'windows-latest'
run: |
cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE="../vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_OVERLAY_PORTS="../ports" -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DVCPKG_TARGET_TRIPLET=x64-windows-static -DENABLE_STATIC=ON
cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE="../vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_OVERLAY_PORTS="../ports" -DCMAKE_BUILD_TYPE=${{matrix.build_type}} ${{matrix.windows-linkage}}
cd build
cmake --build . --config ${{matrix.build_type}}
@@ -82,71 +83,4 @@ jobs:
if: matrix.os == 'windows-latest'
run: |
cd ${{matrix.build_type}}
start cpprealm_db_tests.exe
# build-dynamic:
# runs-on: ${{ matrix.os }}
# name: "Dynamic linkage"
# strategy:
# matrix:
# os: [ ubuntu-latest, windows-latest, macos-latest ]
# build_type: [ Debug, Release ]
#
# steps:
# - name: Checkout
# uses: actions/checkout@v2
# with:
# submodules: 'recursive'
#
# - name: "Set environmental variables"
# shell: bash
# run: |
# echo "VCPKG_ROOT=$VCPKG_INSTALLATION_ROOT" >> $GITHUB_ENV
#
# - name: Install dependencies
# if: matrix.os == 'ubuntu-latest'
# run: |
# sudo apt-get update
# sudo apt-get install -y \
# ninja-build
#
# - name: Setup Ninja
# if: matrix.os == 'macos-latest'
# uses: seanmiddleditch/gha-setup-ninja@master
#
# - name: Configure and build (macOS)
# working-directory: ./tests
# if: matrix.os == 'macos-latest'
# run: |
# cmake -GNinja -B build -S . -DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" -DVCPKG_OVERLAY_PORTS="../ports" -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DVCPKG_TARGET_TRIPLET=x64-osx-dynamic
# cd build
# cmake --build . --config ${{matrix.build_type}}
#
# - name: Configure and build (Ubuntu)
# working-directory: ./tests
# if: matrix.os == 'ubuntu-latest'
# run: |
# cmake -GNinja -B build -S . -DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" -DVCPKG_OVERLAY_PORTS="../ports" -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DVCPKG_TARGET_TRIPLET=x64-linux-dynamic
# cd build
# cmake --build . --config ${{matrix.build_type}}
#
# - name: Configure and build (Windows)
# working-directory: ./tests
# if: matrix.os == 'windows-latest'
# run: |
# cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" -DVCPKG_OVERLAY_PORTS="../ports" -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DVCPKG_TARGET_TRIPLET=x64-windows
# cd build
# cmake --build . --config ${{matrix.build_type}}
#
# - name: Run Application (Unix)
# working-directory: ./tests/build
# if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
# run: |
# ./cpprealm_db_tests
#
# - name: Run Application (Windows)
# working-directory: ./tests/build
# if: matrix.os == 'windows-latest'
# run: |
# cd ${{matrix.build_type}}
# start cpprealm_db_tests.exe
start cpprealm_db_tests.exe
2 changes: 1 addition & 1 deletion ports/portfile.cmake
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ vcpkg_execute_required_process(
LOGNAME submodules
)

set(CPPREALM_CMAKE_OPTIONS -DREALM_CPP_NO_TESTS=ON -DREALM_CORE_SUBMODULE_BUILD=OFF)
set(CPPREALM_CMAKE_OPTIONS -DREALM_CPP_NO_TESTS=ON)

if (ANDROID OR WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Linux")
list(APPEND CPPREALM_CMAKE_OPTIONS -DREALM_USE_SYSTEM_OPENSSL=ON)
2 changes: 1 addition & 1 deletion ports/vcpkg.json
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@
},
{
"name": "realm-core",
"version>=": "14.6.2"
"version>=": "14.8.0"
}
]
}

0 comments on commit 19bd6ec

Please sign in to comment.