Mirrors/rive-cpp
0
0
Fork 0
mirror of https://github.com/rive-app/rive-cpp.git synced 2026-01-18 21:21:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pushing merge, resolved using upstream.\n\n message=update mono to keep details in commit and not pr

Browse Source 
gonna double check it and merge it...

previous job failed on hte pr message, probably too complex

https://github.com/rive-app/rive/actions/runs/7929209375/job/21648989390

```
+ gh pr create --fill --title 'There have been merge conflicts' --body 'diff --cc .github/workflows/tests.yml
index 76659125,e20119eb..00000000
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@@ -58,8 -58,9 +58,12 @@@ jobs
          run: |
            cd dev/test
            C:\premake5.exe --scripts=..\..\build vs2022
++<<<<<<< ours
++=======
+           cd out/debug
++>>>>>>> theirs
            MSBuild rive.sln
-           build\bin\debug\tests.exe
+           tests.exe

    build-macos:
      runs-on: macOS-latest'
pull request create failed: GraphQL: Something went wrong while executing your query. Please include `16C0:22C1:77BF52E:7B4322F:65CF3854` when reporting this issue.
```

Diffs=
6059f744d update mono to keep details in commit and not pr (#6637)
a394393a0 update mono scripts to be able to create "fixing" pr (#6636)
2277c08fc Apply same changes as downstream (#6634)
faf6ea317 Option to build harfbuzz with renames to avoid static lib collision. (#6630)
c51bda03e Fix downstream windows tests. (#6632)

Co-authored-by: Luigi Rosso <luigi-rosso@users.noreply.github.com>
Co-authored-by: Maxwell Talbot <talbot.maxwell@gmail.com> diff=\n\ndiff --cc .github/workflows/tests.yml
index 76659125,e20119eb..00000000
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@@ -58,8 -58,9 +58,12 @@@ jobs
          run: |
            cd dev/test
            C:\premake5.exe --scripts=..\..\build vs2022
++<<<<<<< ours
++=======
+           cd out/debug
++>>>>>>> theirs
            MSBuild rive.sln
-           build\bin\debug\tests.exe
+           tests.exe

    build-macos:
      runs-on: macOS-latest
This commit is contained in:
mjtalbot
2024-02-16 10:47:45 +00:00
committed by Maxwell Talbot
parent d708426dde
commit c9a52af321
8 changed files with 912 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@@ -57,16 +57,19 @@ rive-cpp uses clang-format, you can install it with brew on MacOS: ```brew insta
## Memory Checks
Note that if you're on MacOS you'll want to install valgrind, which is somewhat complicated these days. This is the easiest solution (please PR a better one when it becomes available).
```
brew tap LouisBrunner/valgrind
brew install --HEAD LouisBrunner/valgrind/valgrind
```
You can now run the all the tests through valgrind by running ```test.sh memory```.
## Disassembly Explorer
If you want to examine the generated assembly code per cpp file, install [Disassembly Explorer](https://marketplace.visualstudio.com/items?itemName=dseight.disasexpl) in VSCode.
A ```disassemble``` task is provided to compile and preview the generated assembly. You can reach it via the Tasks: Run Task command palette or you can bind it to a shortcut by editing your VSCode keybindings.json:
```
[
{
@@ -75,4 +78,4 @@ A ```disassemble``` task is provided to compile and preview the generated assemb
"args": "disassemble"
}
]
```
```