Skip to content

Commit

Permalink
Fix weirdness on CI
Browse files Browse the repository at this point in the history
  • Loading branch information
leemaguire committed Jun 26, 2024
1 parent f50066e commit 30783d8
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 24 deletions.
14 changes: 5 additions & 9 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,25 +65,21 @@ jobs:
- uses: ammaraskar/gcc-problem-matcher@master

- name: Configure
run: |
mkdir build
cd build
cmake -GXcode -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DREALM_ENABLE_EXPERIMENTAL=1 -DREALM_DISABLE_ALIGNED_STORAGE=${{ matrix.disable-aligned-storage }} -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ..
run: cmake --preset macos -DCMAKE_VERBOSE_MAKEFILE=${RUNNER_DEBUG:-OFF} -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DREALM_ENABLE_EXPERIMENTAL=1 -DREALM_DISABLE_ALIGNED_STORAGE=${{ matrix.disable-aligned-storage }} -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache

- name: Compile
working-directory: build
run: cmake --build . --config ${{ matrix.configuration }}
run: cmake --build --preset macos --config ${{ matrix.configuration }}

- name: Non Sync Tests
working-directory: build/tests/${{ matrix.configuration }}/
working-directory: .build/cmake-preset-macos/tests/${{ matrix.configuration }}/
run: ./cpprealm_db_tests

- name: Flexible Sync Tests
working-directory: .build/tests/${{ matrix.configuration }}/
working-directory: .build/cmake-preset-macos/tests/${{ matrix.configuration }}/
run: ./cpprealm_sync_tests "~client_reset"

- name: Client Reset Tests
working-directory: .build/tests/${{ matrix.configuration }}/
working-directory: .build/cmake-preset-macos/tests/${{ matrix.configuration }}/
run: ./cpprealm_sync_tests "client_reset"

- name: Publish Test Report
Expand Down
1 change: 0 additions & 1 deletion CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
"inherits": "default",
"generator": "Xcode",
"cacheVariables": {
"CMAKE_MAKE_PROGRAM": "${sourceDir}/cmake/cmake-build-xcode.sh",
"CMAKE_SYSTEM_NAME": "Darwin",
"CMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH": "YES"
},
Expand Down
14 changes: 0 additions & 14 deletions cmake/cmake-build-xcode.sh

This file was deleted.

0 comments on commit 30783d8

Please sign in to comment.