Fix downstream cpp tests

Still trying! Logging more details now. Diffs= 1cf6a65f1 Fix downstream cpp tests (#6643) Co-authored-by: Luigi Rosso <luigi-rosso@users.noreply.github.com>
2026-01-18 21:21:17 +01:00 · 2024-02-16 19:23:47 +00:00
parent b1d54ea0ec
commit ab10ebec06
3 changed files with 66 additions and 85 deletions
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -32,35 +32,13 @@ jobs:
          ./test.sh

  build-windows:
-    runs-on: windows-latest
+    runs-on: windows-2022
    steps:
      - uses: actions/checkout@v2
-      - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v1.1
-
-      - name: Download Premake
-        shell: powershell
+      - name: Tests
        run: |
-          echo GITHUB_WORKSPACE is ${{ github.workspace }}
-          wget https://github.com/premake/premake-core/releases/download/v5.0.0-beta1/premake-5.0.0-beta1-windows.zip -OutFile ${{ github.workspace }}\premake-5.0.0-beta1-windows.zip
-          Expand-Archive -LiteralPath ${{ github.workspace }}\premake-5.0.0-beta1-windows.zip -DestinationPath C:\
-
-      - name: Build rive.lib
-        shell: powershell
-        run: |
-          cd build
-          C:\premake5.exe vs2022 --with_rive_text --with_rive_audio=external
-          MSBuild rive.sln /property:Configuration=Debug /property:Platform=x64
-          cd ..
-
-      - name: Run rive tests
-        shell: powershell
-        run: |
-          cd dev/test
-          C:\premake5.exe --scripts=..\..\build vs2022 --with_rive_text --with_rive_audio=external
-          cd out/debug
-          MSBuild rive.sln
-          tests.exe
+          cd dev
+          ./test.sh

  build-macos:
    runs-on: macOS-latest
--- a/.rive_head
+++ b/.rive_head
@@ -1 +1 @@
-a358835081a47fba704a5ff13f2dd1c71ef1ffa6
+1cf6a65f1cb3f98e113397be9096250f7052a845
--- a/dev/test.sh
+++ b/dev/test.sh
@@ -12,43 +12,43 @@ esac
 CONFIG=debug

 for var in "$@"; do
-    if [[ $var = "release" ]]; then
-        CONFIG=release
-    elif [ "$var" = "memory" ]; then
-        echo Will perform memory checks...
-        UTILITY='leaks --atExit --'
-        shift
-    elif [ "$var" = "lldb" ]; then
-        echo Starting debugger...
-        UTILITY='lldb'
-        shift
-    fi
+  if [[ $var = "release" ]]; then
+    CONFIG=release
+  elif [ "$var" = "memory" ]; then
+    echo Will perform memory checks...
+    UTILITY='leaks --atExit --'
+    shift
+  elif [ "$var" = "lldb" ]; then
+    echo Starting debugger...
+    UTILITY='lldb'
+    shift
+  fi
 done

 if [[ ! -f "dependencies/bin/premake5" ]]; then
-    mkdir -p dependencies/bin
-    pushd dependencies
-    if [[ $machine = "macosx" ]]; then
-        # v5.0.0-beta2 doesn't support apple silicon properly, update the branch
-        # once a stable one is avaialble that supports it
-        git clone --depth 1 --branch master https://github.com/premake/premake-core.git
-        pushd premake-core
-        if [[ $LOCAL_ARCH == "arm64" ]]; then
-            PREMAKE_MAKE_ARCH=ARM
-        else
-            PREMAKE_MAKE_ARCH=x86
-        fi
-        make -f Bootstrap.mak osx PLATFORM=$PREMAKE_MAKE_ARCH
-        cp bin/release/* ../bin
-        popd
-    elif [[ $machine = "windows" ]]; then
-        pushd bin
-        curl https://github.com/premake/premake-core/releases/download/v5.0.0-beta2/premake-5.0.0-beta2-windows.zip -L -o premake_windows.zip
-        unzip premake_windows.zip
-        rm premake_windows.zip
-        popd
+  mkdir -p dependencies/bin
+  pushd dependencies
+  if [[ $machine = "macosx" ]]; then
+    # v5.0.0-beta2 doesn't support apple silicon properly, update the branch
+    # once a stable one is avaialble that supports it
+    git clone --depth 1 --branch master https://github.com/premake/premake-core.git
+    pushd premake-core
+    if [[ $LOCAL_ARCH == "arm64" ]]; then
+      PREMAKE_MAKE_ARCH=ARM
+    else
+      PREMAKE_MAKE_ARCH=x86
    fi
+    make -f Bootstrap.mak osx PLATFORM=$PREMAKE_MAKE_ARCH
+    cp bin/release/* ../bin
    popd
+  elif [[ $machine = "windows" ]]; then
+    pushd bin
+    curl https://github.com/premake/premake-core/releases/download/v5.0.0-beta2/premake-5.0.0-beta2-windows.zip -L -o premake_windows.zip
+    unzip premake_windows.zip
+    rm premake_windows.zip
+    popd
+  fi
+  popd
 fi

 export PREMAKE=$PWD/dependencies/bin/premake5
@@ -56,18 +56,18 @@ export PREMAKE=$PWD/dependencies/bin/premake5
 pushd test &>/dev/null

 for var in "$@"; do
-    if [[ $var = "clean" ]]; then
-        echo 'Cleaning...'
-        rm -fR out
-    fi
+  if [[ $var = "clean" ]]; then
+    echo 'Cleaning...'
+    rm -fR out
+  fi
 done

 mkdir -p out

 if [[ $machine = "macosx" ]]; then
-    TARGET=gmake2
+  TARGET=gmake2
 elif [[ $machine = "windows" ]]; then
-    TARGET=vs2022
+  TARGET=vs2022
 fi

 pushd ../../../
@@ -75,33 +75,36 @@ PACKAGES=$PWD
 popd

 export PREMAKE_PATH="$PACKAGES/runtime/dependencies/export-compile-commands":"$PACKAGES/runtime/build":"$PREMAKE_PATH"
+echo "PREMAKE PATH IS " $PREMAKE_PATH
+echo "GOT EXPECTED?"
+ls $PACKAGES/runtime/build

 PREMAKE_COMMANDS="--with_rive_text --with_rive_audio=external --config=$CONFIG"

 out_dir() {
-    echo "out/$CONFIG"
+  echo "out/$CONFIG"
 }
 if [[ $machine = "macosx" ]]; then
-    OUT_DIR="$(out_dir)"
-    $PREMAKE $TARGET $PREMAKE_COMMANDS --out=$OUT_DIR
-    pushd $OUT_DIR
-    make -j$(($(sysctl -n hw.physicalcpu) + 1))
-    popd
-    $UTILITY $OUT_DIR/tests
+  OUT_DIR="$(out_dir)"
+  $PREMAKE $TARGET $PREMAKE_COMMANDS --out=$OUT_DIR
+  pushd $OUT_DIR
+  make -j$(($(sysctl -n hw.physicalcpu) + 1))
+  popd
+  $UTILITY $OUT_DIR/tests
 elif [[ $machine = "windows" ]]; then
-    if [[ -f "$PROGRAMFILES/Microsoft Visual Studio/2022/Enterprise/Msbuild/Current/Bin/MSBuild.exe" ]]; then
-        export MSBUILD="$PROGRAMFILES/Microsoft Visual Studio/2022/Enterprise/Msbuild/Current/Bin/MSBuild.exe"
-    elif [[ -f "$PROGRAMFILES/Microsoft Visual Studio/2022/Community/Msbuild/Current/Bin/MSBuild.exe" ]]; then
-        export MSBUILD="$PROGRAMFILES/Microsoft Visual Studio/2022/Community/Msbuild/Current/Bin/MSBuild.exe"
-    fi
-    OUT_DIR="$(out_dir)"
-    echo $PREMAKE $TARGET $PREMAKE_COMMANDS --out=$OUT_DIR
-    ls -l
-    $PREMAKE $TARGET $PREMAKE_COMMANDS --out=$OUT_DIR
-    pushd $OUT_DIR
-    "$MSBUILD" rive.sln -m:$NUMBER_OF_PROCESSORS
-    popd
-    $OUT_DIR/tests.exe
+  if [[ -f "$PROGRAMFILES/Microsoft Visual Studio/2022/Enterprise/Msbuild/Current/Bin/MSBuild.exe" ]]; then
+    export MSBUILD="$PROGRAMFILES/Microsoft Visual Studio/2022/Enterprise/Msbuild/Current/Bin/MSBuild.exe"
+  elif [[ -f "$PROGRAMFILES/Microsoft Visual Studio/2022/Community/Msbuild/Current/Bin/MSBuild.exe" ]]; then
+    export MSBUILD="$PROGRAMFILES/Microsoft Visual Studio/2022/Community/Msbuild/Current/Bin/MSBuild.exe"
+  fi
+  OUT_DIR="$(out_dir)"
+  echo $PREMAKE $TARGET $PREMAKE_COMMANDS --out=$OUT_DIR
+  ls -l
+  $PREMAKE $TARGET $PREMAKE_COMMANDS --out=$OUT_DIR
+  pushd $OUT_DIR
+  "$MSBUILD" rive.sln -m:$NUMBER_OF_PROCESSORS
+  popd
+  $OUT_DIR/tests.exe
 fi

 popd &>/dev/null