Merge branch 'master' into develop

FlightControl-Master · Oct 19, 2023 · 4fced34 · 4fced34
2 parents 1b50670 + d4a4660
commit 4fced34
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml
@@ -25,7 +25,7 @@ jobs:
             echo "Repository:    ${{ github.repository }}"
             echo "Commit-Id:     ${{ github.sha }}"
             echo "Owner:         ${{ github.repository_owner }}"
-            echo "FORCE_PUSH:    ${{ env.FORCE_PUSH }}"
+            echo "FORCE_PUSH:    ${{ vars.FORCE_PUSH }}"
 
       #########################################################################
       # Prepare build environment
@@ -126,8 +126,8 @@ jobs:
         run: |
           cp ./build/doc/*.html ./build/MOOSE_DOCS/Documentation/
 
-      - name: Push result to docs repository (skipped by act)
-        if: ${{ env.FORCE_PUSH == 'true' }}
+      - name: Push result to docs repository
+        if: ${{ vars.FORCE_PUSH == 'true' }}
         run: |
           git config user.name "kaltokri"
           git config user.email "rolf.geuenich@gmail.com"

diff --git a/.github/workflows/build-includes.yml b/.github/workflows/build-includes.yml
@@ -24,7 +24,7 @@ jobs:
             echo "Branch name:   ${{ steps.extract_branch.outputs.branch }}"
             echo "Repository:    ${{ github.repository }}"
             echo "Commit-Id:     ${{ github.sha }}"
-            echo "FORCE_PUSH:    ${{ env.FORCE_PUSH }}"
+            echo "FORCE_PUSH:    ${{ vars.FORCE_PUSH }}"
 
       #########################################################################
       # Prepare build environment
@@ -95,7 +95,7 @@ jobs:
       # Run LuaCheck
       #########################################################################
       - name: Run LuaCheck
-        if: ${{ env.SKIP_LUACHECK != 'true' }}
+        if: ${{ vars.SKIP_LUACHECK != true }}
         continue-on-error: true
         run: |
           luacheck --std=lua51c --config=.luacheckrc -gurasqq "Moose Development/Moose"
@@ -119,8 +119,8 @@ jobs:
         run: |
           cp -r ./build/result/* ./build/MOOSE_INCLUDE/
 
-      - name: Push result to MOOSE_INCLUDE repository (skipped by act)
-        if: ${{ env.FORCE_PUSH == 'true' }}
+      - name: Push result to MOOSE_INCLUDE repository
+        if: ${{ vars.FORCE_PUSH == 'true' }}
         run: |
           git config user.name "MooseBotter"
           git config user.email "moosebotter@tniedermeier.com"

diff --git a/Moose Development/Moose/Sound/SRS.lua b/Moose Development/Moose/Sound/SRS.lua
@@ -94,7 +94,7 @@
 -- ## Set Google
 -- 
 -- Use Google's text-to-speech engine with the @{#MSRS.SetGoogle} function, e.g. ':SetGoogle()'.
--- By enabling this it also allows you to utilize SSML in your text for added flexibilty.
+-- By enabling this it also allows you to utilize SSML in your text for added flexibility.
 -- For more information on setting up a cloud account, visit: https://cloud.google.com/text-to-speech
 -- Google's supported SSML reference: https://cloud.google.com/text-to-speech/docs/ssml
 -- 

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![Build status](https://ci.appveyor.com/api/projects/status/1y8nfmx7lwsn33tt?svg=true)](https://ci.appveyor.com/project/Applevangelist/MOOSE)
+[![Moose-Includes](https://github.com/FlightControl-Master/MOOSE/actions/workflows/build-includes.yml/badge.svg?branch=master)](https://github.com/FlightControl-Master/MOOSE/actions/workflows/build-includes.yml)
 
 # MOOSE framework