Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Splamy committed Aug 17, 2018
2 parents cb1448a + 4be7c65 commit f7375ff
Show file tree
Hide file tree
Showing 203 changed files with 16,341 additions and 6,403 deletions.
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# EditorConfig is awesome: https://EditorConfig.org

root = true

[*]
Expand All @@ -7,6 +9,8 @@ charset = utf-8

[*.cs]
indent_style = tab
indent_size = tab
tab_width = 4
trim_trailing_whitespace = true

[*.{tt,ttinclude}]
Expand Down
28 changes: 28 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
name: Bug report
about: Create a report to help us improve

---

**Describe the bug**
A clear and concise description of what the bug is.

**Expected behavior**
A clear and concise description of what you expected to happen.

**To Reproduce**
Steps to reproduce the behavior (if possible)

**Version**
Which commit did you build or download? (mono TS3AudiBot.exe -V or !version in chat)

**Platform**
Which platform(-version) are you running on? (ubuntu 16.04, arch, windows,...)
Which runtime(-version) are you using? (mono: mono -V, dotnet: dotnet --info)

**Log**
```
Paste the important log parts from the ts3audiobot.log into this code block here.
Try not to paste too little.
At best from the first to last interaction from you which reproduces this problem.
```
14 changes: 14 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
name: Feature request
about: Suggest an idea for this project

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
28 changes: 28 additions & 0 deletions .github/ISSUE_TEMPLATE/setup_help.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
name: Setup help
about: Problems setting up or running the bot

---

**Describe the problem**
A clear and concise description of what the problem is.

**To Reproduce**
Steps to reproduce the behavior

**System Information**
- **Platform**: (Ubuntu 16.04, Debian 8, Arch, etc)

- **Mono version**: (`mono -V`)

- **Which commit did you download**: (or on prebuilt: `mono TS3AudioBot.exe -V`)

(If all fields in the TS3AudioBot log header are correctly filled you can
alternatively just post the header here.)

**Additional Logs, Exceptions, etc**
When applicable try to add relevant log excerpts here.

```
Put logs or code in triple backticks like here to properly format it.
```
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ ipch/
*.psess
*.vsp
*.vspx
*.diagsession

# TFS 2012 Local Workspace
$tf/
Expand Down
59 changes: 42 additions & 17 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
sudo: false
language: csharp

matrix:
include:
- dotnet: 2.1.4
mono: none
env: DOTNETCORE=1
- mono: latest

notifications:
email: false

Expand All @@ -20,30 +27,48 @@ addons:
git:
depth: 9999999

# TODO: add test runner for dotnet core too
install:
- nuget restore TS3AudioBot.sln
- nuget install NUnit.Runners -OutputDirectory nunit
- |
if [[ $DOTNETCORE = 1 ]]; then
echo "dotnet core"
dotnet restore TS3AudioBot.sln
else
echo "mono"
nuget restore TS3AudioBot.sln
nuget install NUnit.Runners -OutputDirectory nunit
fi
script:
- cfg="/p:Configuration=Release TS3AudioBot.sln"
- if command -v msbuild; then
msbuild $cfg;
elif command -v xbuild; then
xbuild $cfg;
- |
if [[ $DOTNETCORE = 1 ]]; then
dotnet build --framework netcoreapp2.0 --configuration Release TS3AudioBot
else
echo "No mono build tool found!";
false;
if command -v msbuild; then
buildtool="msbuild"
elif command -v xbuild; then
buildtool="xbuild"
else
echo "No mono build tool found!"
false
fi
"${buildtool}" /p:Configuration=Release /p:TargetFramework=net46 TS3AudioBot.sln
mono ./nunit/NUnit.ConsoleRunner.*.*.*/tools/nunit3-console.exe ./TS3ABotUnitTests/bin/Release/net46/TS3ABotUnitTests.dll
fi
- mono ./nunit/NUnit.ConsoleRunner.*.*.*/tools/nunit3-console.exe ./TS3ABotUnitTests/bin/Release/TS3ABotUnitTests.dll
after_success:
- export MAIN_DIR=`pwd`
- cd ./TS3AudioBot/bin/Release
- ls
- zip TS3AudioBot.zip NLog.config *.exe *.dll x64/* x86/*
- 'export version=`mono TS3AudioBot.exe --version | grep "Version: "`'
- "curl -I -H \"Content-Type: application/zip\" -X PUT \"https://splamy.de/api/nightly/ts3ab/${TRAVIS_BRANCH}?token=${uploadkey}&filename=TS3AudioBot.zip&commit=${TRAVIS_COMMIT}&version=${version:9}\" --upload-file ./TS3AudioBot.zip"
- cd "$MAIN_DIR"
- |
if [[ $DOTNETCORE = 1 ]]; then
echo "No Task!"
else
export MAIN_DIR=`pwd`
cd ./TS3AudioBot/bin/Release/net46
ls
zip TS3AudioBot.zip NLog.config *.exe *.dll x64/* x86/*
export version=`mono TS3AudioBot.exe --version | grep "Version: "`
curl -I -H "Content-Type: application/zip" -X PUT "https://splamy.de/api/nightly/ts3ab/${TRAVIS_BRANCH}?token=${uploadkey}&filename=TS3AudioBot.zip&commit=${TRAVIS_COMMIT}&version=${version:9}" --upload-file ./TS3AudioBot.zip
cd "$MAIN_DIR"
fi
after_script:
- chmod u+x ts3notify.sh
Expand Down
22 changes: 0 additions & 22 deletions .vscode/launch.json

This file was deleted.

20 changes: 9 additions & 11 deletions InstallOpus.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

baseDir=`pwd`

OpusBaseName="opus-1.1.3"
OpusBaseName="opus-1.2.1"
OpusFileName="$OpusBaseName.tar.gz"

# Download the Opus library
Expand All @@ -21,15 +21,13 @@ tar -vxf "$OpusFileName"
cd "$OpusBaseName"

# Build the library
./configure && make
./configure && make && sudo make install

# Go back
cd "$baseDir"

# Copy the required libopus.so to the local folder
cp "$OpusBaseName/.libs/libopus.so" "./"

# Copy the libopus.so to the folder we need
cp "./libopus.so" "$baseDir/TS3AudioBot/bin/Release/libopus.so"
# Move to global folder
if [ ! -f /usr/lib/libopus.so ]; then
sudo cp ".libs/libopus.so" "/usr/lib/"
else
echo "'/urs/lib/libopus.so' already exists, will not be overwritten"
fi

echo "Done"
echo "Done"
Loading

0 comments on commit f7375ff

Please sign in to comment.