Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into pm5
Browse files Browse the repository at this point in the history
  • Loading branch information
dktapps committed Jun 2, 2023
2 parents 6d04d58 + 84021a2 commit b732120
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: monthly
12 changes: 6 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,25 @@ on:
jobs:
build:
name: PHPStan analysis
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
strategy:
fail-fast: false
matrix:
php:
- "8.0.19"
php: ["8.1", "8.2"]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Setup PHP
uses: pmmp/setup-php-action@247e08acd52c1465f8f144c162c88f079d8c1174
uses: pmmp/setup-php-action@2.0.0
with:
php-version: ${{ matrix.php }}
install-path: "./bin"
pm-version-major: 4

- name: Restore Composer package cache
id: composer-cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: "~/.cache/composer"
key: "php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}"
Expand Down
3 changes: 2 additions & 1 deletion src/Main.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ public function onEnable() : void{
try{
$config = $this->loadConfig($configPath);
}catch(PluginException $e){
throw new DisablePluginException('Failed to load config file ' . $configPath . ': ' . $e->getMessage());
$this->getLogger()->alert('Failed to load config file ' . $configPath . ': ' . $e->getMessage());
throw new DisablePluginException();
}

$this->getLogger()->info('Starting RCON on ' . $config->ip . ':' . $config->port);
Expand Down

0 comments on commit b732120

Please sign in to comment.