From 583c10571c451b55481a1bfb54420b9a7c73d34d Mon Sep 17 00:00:00 2001
From: rivessamr <hello@rive.app>
Date: Fri, 23 Aug 2024 21:55:37 +0000
Subject: [PATCH] Pushing merge, resolved using upstream.\n\n message=Fix
 actions yaml with rive-renderer

Fix actions yaml with rive-renderer instead of cpp

Diffs=
21ecf2775 Fix actions yaml with rive-renderer (#7930)
c33d5d81b Update rive renderer readme (#7929)
b03895fcf Update pls README (#7927)
3316d15ca Refactor pls into runtime (#7914)

Co-authored-by: Chris Dalton <99840794+csmartdalton@users.noreply.github.com>
Co-authored-by: rivessamr <suki@rive.app> diff=\n\ndiff --cc pls/README.md
index 1f4232bd,272c7360..00000000
--- a/pls/README.md
+++ b/pls/README.md
@@@ -2,21 -2,21 +2,37 @@@

  The Rive Renderer is a vector and raster graphics renderer custom-built for Rive content, for animation, and for runtime.

++<<<<<<< ours
 +This repository contains the renderer code and an example for how to interface with it directly. The code within this repository does not contain a Rive runtime. It contains the best in class concrete implementation of Rive's rendering abstraction layer, which we call the Rive Renderer.
 +
 +## Clone this repo
 +
 +Make sure to clone this repo with submodules!
 +
 +```
 +git clone --recurse-submodules git@github.com:rive-app/rive-renderer.git
++=======
+ This folder contains the renderer code and an example for how to interface with it directly. It contains the best in class concrete implementation of Rive's rendering abstraction layer, which we call the Rive Renderer.
+
+ ## Clone the rive-runtime repo
+
+ ```
+ git clone https://github.com/rive-app/rive-runtime.git
+ cd rive-runtime/pls
++>>>>>>> theirs
  ```

  ## Build GLFW

  ```
++<<<<<<< ours
 +cd submodules/rive-cpp/skia/dependencies
 +./make_glfw.sh
++=======
+ pushd ../skia/dependencies
+ ./make_glfw.sh
+ popd
++>>>>>>> theirs
  ```

  ## Install Python PLY
@@@ -28,7 -28,7 +44,11 @@@ python3 -m pip install pl
  ## Add build_rive.sh to $PATH

  ```
++<<<<<<< ours
 +export PATH="$PATH:$(pwd)/submodules/rive-cpp/build"
++=======
+ export PATH="$PATH:$(realpath ../build)"
++>>>>>>> theirs
  ```

  ## Build & run
---
 .rive_head    |  2 +-
 pls/README.md | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.rive_head b/.rive_head
index f1c6c3be..56395e47 100644
--- a/.rive_head
+++ b/.rive_head
@@ -1 +1 @@
-5f6ea0da19c6d1b517ba091d84706141c9a6f59f
+21ecf27753b8eedd68ec732b2b2a76c4a4cdb1d8
diff --git a/pls/README.md b/pls/README.md
index 1f4232bd..272c7360 100644
--- a/pls/README.md
+++ b/pls/README.md
@@ -2,21 +2,21 @@
 
 The Rive Renderer is a vector and raster graphics renderer custom-built for Rive content, for animation, and for runtime.
 
-This repository contains the renderer code and an example for how to interface with it directly. The code within this repository does not contain a Rive runtime. It contains the best in class concrete implementation of Rive's rendering abstraction layer, which we call the Rive Renderer.
+This folder contains the renderer code and an example for how to interface with it directly. It contains the best in class concrete implementation of Rive's rendering abstraction layer, which we call the Rive Renderer.
 
-## Clone this repo
-
-Make sure to clone this repo with submodules!
+## Clone the rive-runtime repo
 
 ```
-git clone --recurse-submodules git@github.com:rive-app/rive-renderer.git
+git clone https://github.com/rive-app/rive-runtime.git
+cd rive-runtime/pls
 ```
 
 ## Build GLFW
 
 ```
-cd submodules/rive-cpp/skia/dependencies
+pushd ../skia/dependencies
 ./make_glfw.sh
+popd
 ```
 
 ## Install Python PLY
@@ -28,7 +28,7 @@ python3 -m pip install ply
 ## Add build_rive.sh to $PATH
 
 ```
-export PATH="$PATH:$(pwd)/submodules/rive-cpp/build"
+export PATH="$PATH:$(realpath ../build)"
 ```
 
 ## Build & run