Merge remote-tracking branch 'origin/develop' into prc_bug_fixes

NREL · Dec 10, 2024 · 2424fe2 · 2424fe2
2 parents 3cd26a7 + d303f9a
commit 2424fe2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/Publish_ROSCO.yml b/.github/workflows/Publish_ROSCO.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-12, macos-13, macos-14]
+        os: [ubuntu-latest, windows-latest, macOS-latest]
 
     steps:
       - name: Set up QEMU

diff --git a/docs/source/install.rst b/docs/source/install.rst
@@ -50,7 +50,7 @@ This step creates the rosco controller binary (:code:`libdiscon.so` (Linux), :co
 
 .. code-block:: bash
 
-    conda env update --file enviroment.yml
+    conda env update --file environment.yml
     pip install -e . --no-deps
 
 .. _rosco_controller: