3 Commits

Author SHA1 Message Date
mjtalbot
240e1dced2 Fix premake tag
fix builds for editor and tasks

Went with beta3 for anything that looks like apple silicone, seems to have been used in other cases (maybe we want to try beta4 though?)

also we use beta2 a "lot" elsewhere, so stuck to that on linux. but i think we should probably just bump everything to 4

Diffs=
b153a81b61 Fix premake tag (#8865)
8c9dc78dbd Android BrowserStack fixups (#8856)

Co-authored-by: Chris Dalton <99840794+csmartdalton@users.noreply.github.com>
Co-authored-by: Maxwell Talbot <talbot.maxwell@gmail.com>
2025-01-14 11:40:58 +00:00
luigi-rosso
03d7c9c587 Updating harfbuzz to 8.3.0
[This thread](https://2dimensions.slack.com/archives/C067PQQL3EK/p1708104838351439) had me looking through the harfbuzz codebase to see if we could change the way some of the symbols were exported (our renames was getting clashing defines).

That made me take a closer look at all the changes since 6.0.0 (the version we were pegged at). There are a ton of performance and stability changes since 6.0.0 that we really want (take a look at the [release page](https://github.com/harfbuzz/harfbuzz/releases) for a list).

So I took this opportunity to update our renames script, pin us to a new harfbuzz and branch it with some changes to disable exporting certain symbols that are normally accessed via defines in C++ but are exported as a courtesy to wrapping language bindings. We don't need those so I added a way to compile them out for us.

Diffs=
9d605a1fe Updating harfbuzz to 8.3.0 (#6652)

Co-authored-by: Luigi Rosso <luigi-rosso@users.noreply.github.com>
2024-02-20 18:30:53 +00:00
mjtalbot
c9a52af321 Pushing merge, resolved using upstream.\n\n message=update mono to keep details in commit and not pr
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
2024-02-16 11:03:27 +00:00