bump premake

Diffs= bc6010b6e bump premake (#8120) Co-authored-by: Maxwell Talbot <[email protected]>
rive-app · Sep 11, 2024 · 4d8dffb · 4d8dffb
1 parent 1eae8b8
commit 4d8dffb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -15,8 +15,8 @@ jobs:
       - uses: actions/checkout@v2
       - name: Install
         run: |
-          wget -q https://github.com/premake/premake-core/releases/download/v5.0.0-alpha16/premake-5.0.0-alpha16-linux.tar.gz
-          tar -xf premake-5.0.0-alpha16-linux.tar.gz
+          wget -q https://github.com/premake/premake-core/releases/download/v5.0.0-beta2/premake-5.0.0-beta2-linux.tar.gz
+          tar -xf premake-5.0.0-beta2-linux.tar.gz
           sudo chmod a+x premake5
           sudo mv premake5 /usr/local/bin
 
@@ -52,8 +52,8 @@ jobs:
 
       - name: Install
         run: |
-          wget https://github.com/premake/premake-core/releases/download/v5.0.0-alpha16/premake-5.0.0-alpha16-macosx.tar.gz
-          tar -xvf premake-5.0.0-alpha16-macosx.tar.gz
+          wget -q https://github.com/premake/premake-core/releases/download/v5.0.0-beta2/premake-5.0.0-beta2-macosx.tar.gz
+          tar -xf premake-5.0.0-beta2-macosx.tar.gz
           sudo chmod a+x premake5
           sudo mv premake5 /usr/local/bin
 

diff --git a/.rive_head b/.rive_head
@@ -1 +1 @@
-06f13b3d8d8611738d9aaf031971714df83ed4a5
+bc6010b6ee16eb48240823fd2086a363848a7d3d
diff --git a/dependencies/macosx/get_premake5.sh b/dependencies/macosx/get_premake5.sh
@@ -7,7 +7,7 @@ fi
 
 mkdir -p $DEPENDENCIES/bin
 echo Downloading Premake5
-curl https://github.com/premake/premake-core/releases/download/v5.0.0-beta1/premake-5.0.0-beta1-macosx.tar.gz -L -o $DEPENDENCIES//bin/premake_macosx.tar.gz
+curl https://github.com/premake/premake-core/releases/download/v5.0.0-beta2/premake-5.0.0-beta2-macosx.tar.gz -L -o $DEPENDENCIES//bin/premake_macosx.tar.gz
 cd $DEPENDENCIES/bin
 # Export premake5 into bin
 tar -xvf premake_macosx.tar.gz 2>/dev/null

diff --git a/skia/thumbnail_generator/build.sh b/skia/thumbnail_generator/build.sh
@@ -3,8 +3,8 @@ set -e
 
 BASEDIR="$PWD"
 
-if [ -d "$PWD/../../../rive-cpp" ]; then
-    export RIVE_RUNTIME_DIR="$PWD/../../../rive-cpp"
+if [ -d "$PWD/../../../rive-runtime" ]; then
+    export RIVE_RUNTIME_DIR="$PWD/../../../rive-runtime"
 else
     export RIVE_RUNTIME_DIR="$PWD/../../../runtime"
 fi
@@ -18,6 +18,8 @@ cd build
 
 OPTION=$1
 
+export PREMAKE_PATH="$RIVE_RUNTIME_DIR/build":$PREMAKE_PATH
+
 if [ "$OPTION" = 'help' ]; then
     echo build.sh - build debug library
     echo build.sh clean - clean the build