FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
kaltokri
2023-10-19 18:17:12 +02:00
parent 1b5067088f d4a46606fd
commit 4fced3416a
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build-docs.yml vendored
View File

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

8
.github/workflows/build-includes.yml vendored
View File

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

2
Moose Development/Moose/Sound/SRS.lua
View File

@@ -94,7 +94,7 @@
-- ## Set Google -- ## Set Google
-- --
-- Use Google's text-to-speech engine with the @{#MSRS.SetGoogle} function, e.g. ':SetGoogle()'. -- 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 -- 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 -- Google's supported SSML reference: https://cloud.google.com/text-to-speech/docs/ssml
-- --

2
README.md
View File

@@ -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 # MOOSE framework