From a24e0cbede05feba128c528108abc7b6e1722a51 Mon Sep 17 00:00:00 2001 From: Dylan T Date: Wed, 31 May 2023 17:31:39 +0100 Subject: [PATCH 1/7] Create dependabot.yml --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..7a968a8 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: +- package-ecosystem: github-actions + directory: "/" + schedule: + interval: monthly From 89d472236335a0acefd68a6911acd6a2f9ad230a Mon Sep 17 00:00:00 2001 From: Dylan T Date: Wed, 31 May 2023 17:34:16 +0100 Subject: [PATCH 2/7] Update main.yml --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c4a9f80..828e0af 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,16 +13,17 @@ jobs: fail-fast: false matrix: php: - - "8.0.19" + - "8.1.19" steps: - uses: actions/checkout@v2 - name: Setup PHP - uses: pmmp/setup-php-action@247e08acd52c1465f8f144c162c88f079d8c1174 + uses: pmmp/setup-php-action@1.0.0 with: php-version: ${{ matrix.php }} install-path: "./bin" + pm-version-major: 4 - name: Restore Composer package cache id: composer-cache From d9ea195fbd8276f51c2987b5b09056887b61e7b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 May 2023 17:47:46 +0100 Subject: [PATCH 3/7] Bump actions/cache from 2 to 3 (#11) Bumps [actions/cache](https://github.com/actions/cache) from 2 to 3. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 828e0af..64cb5eb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,7 +27,7 @@ jobs: - 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') }}" From 9b02299b69259ab5d43c4aa3ce9a14954ee2bbe7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 May 2023 17:47:53 +0100 Subject: [PATCH 4/7] Bump actions/checkout from 2 to 3 (#12) Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 64cb5eb..1d21b6d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,7 @@ jobs: - "8.1.19" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup PHP uses: pmmp/setup-php-action@1.0.0 From ff928eab2246c241fbaab24d65ac712b651af3c1 Mon Sep 17 00:00:00 2001 From: Dylan T Date: Wed, 31 May 2023 17:49:49 +0100 Subject: [PATCH 5/7] DisablePluginException doesn't log anything --- src/Main.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Main.php b/src/Main.php index 7755414..a4ac190 100644 --- a/src/Main.php +++ b/src/Main.php @@ -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); From 8dab4b810e789cb6ff99b0c15cebd8931cca3d04 Mon Sep 17 00:00:00 2001 From: Dylan T Date: Wed, 31 May 2023 17:50:20 +0100 Subject: [PATCH 6/7] Image lock to ubuntu-20.04 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1d21b6d..a2e1bec 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ on: jobs: build: name: PHPStan analysis - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: fail-fast: false matrix: From 84021a280e3b6aab3ea081791d1c1c030df95d54 Mon Sep 17 00:00:00 2001 From: Dylan T Date: Wed, 31 May 2023 22:14:24 +0100 Subject: [PATCH 7/7] Use pmmp/setup-php-action@2.0.0 --- .github/workflows/main.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a2e1bec..c709b30 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,14 +12,13 @@ jobs: strategy: fail-fast: false matrix: - php: - - "8.1.19" + php: ["8.1", "8.2"] steps: - uses: actions/checkout@v3 - name: Setup PHP - uses: pmmp/setup-php-action@1.0.0 + uses: pmmp/setup-php-action@2.0.0 with: php-version: ${{ matrix.php }} install-path: "./bin"