Skip to content

Commit

Permalink
feat: update all the other files
Browse files Browse the repository at this point in the history
  • Loading branch information
he3als committed Nov 17, 2024
1 parent bcf445e commit ada77e9
Show file tree
Hide file tree
Showing 13 changed files with 3,079 additions and 2,348 deletions.
8 changes: 5 additions & 3 deletions .github/workflows-disabled/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,21 @@ jobs:
ui:
name: UI
runs-on: ubuntu-20.04
permissions:
contents: read
strategy:
fail-fast: false
matrix:
node-version: [16]
steps:
- name: Code Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: "yarn"
cache: yarn

- name: Install dependencies
run: yarn install --frozen-lockfile
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows-disabled/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,16 @@ jobs:
lint:
name: Lint
runs-on: ubuntu-20.04
permissions:
contents: read
steps:
- name: Code Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: "8.1"
php-version: "8.2"
extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
tools: composer:v2
coverage: none
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows-disabled/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,17 @@ jobs:
release:
name: Release
runs-on: ubuntu-20.04
permissions:
contents: write # write is required to create releases and push.
steps:
- name: Code checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16
cache: "yarn"
cache: yarn

- name: Install dependencies
run: yarn install --frozen-lockfile
Expand All @@ -41,7 +43,7 @@ jobs:
- name: Create release archive
run: |
rm -rf node_modules tests CODE_OF_CONDUCT.md CONTRIBUTING.md flake.lock flake.nix phpunit.xml shell.nix
rm -rf node_modules tests CODE_OF_CONDUCT.md CONTRIBUTING.md flake.lock flake.nix phpunit.xml shell.nix
tar -czf panel.tar.gz * .editorconfig .env.example .eslintignore .eslintrc.js .gitignore .prettierrc.json
- name: Extract changelog
Expand All @@ -58,7 +60,7 @@ jobs:
- name: Create release
id: create_release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
64 changes: 0 additions & 64 deletions .github/workflows/docker-dev.yaml

This file was deleted.

11 changes: 6 additions & 5 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- main
- dev
pull_request:
branches:
- main
Expand All @@ -21,18 +22,18 @@ jobs:
if: "!contains(github.ref, 'develop') || (!contains(github.event.head_commit.message, 'skip docker') && !contains(github.event.head_commit.message, 'docker skip'))"
steps:
- name: Code checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Docker metadata
id: docker_meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ghcr.io/pyrohost/pyrodactyl
flavor: |
latest=false
tags: |
type=raw,value=latest,enable=${{ github.event_name == 'release' && github.event.action == 'published' && github.event.release.prerelease == false }}
type=ref,event=tag
type=raw,value=latest,enable=${{ github.event_name == 'release' && github.event.action == 'published' && github.event.release.prerelease == false && github.ref != 'refs/heads/dev' }}
type=ref,event=tag,enable=${{ github.ref != 'refs/heads/dev' }}
type=ref,event=branch
- name: Setup QEMU
Expand All @@ -57,7 +58,7 @@ jobs:
sed -i "s/ 'version' => 'canary',/ 'version' => '${REF:1}',/" config/app.php
- name: Build and Push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v6
with:
context: .
file: ./Dockerfile
Expand Down
2 changes: 2 additions & 0 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

use PhpCsFixer\Config;
use PhpCsFixer\Finder;
use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;

$finder = (new Finder())
->in(__DIR__)
Expand All @@ -14,6 +15,7 @@
->notName(['_ide_helper*']);

return (new Config())
->setParallelConfig(ParallelConfigFactory::detect())
->setRiskyAllowed(true)
->setFinder($finder)
->setRules([
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN apk add --no-cache --update git \

# Stage 1:
# Build the actual container with all of the needed PHP dependencies that will run the application.
FROM --platform=$TARGETOS/$TARGETARCH php:8.1-fpm-alpine
FROM --platform=$TARGETOS/$TARGETARCH php:8.2-fpm-alpine
WORKDIR /app
COPY . ./
COPY --from=0 /app/public/assets ./public/assets
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/cache/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
*
!.gitignore
!.gitignore
2 changes: 1 addition & 1 deletion bootstrap/tests.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

$app = require __DIR__ . '/app.php';

/** @var \Pterodactyl\Console\Kernel $kernel */
/** @var Pterodactyl\Console\Kernel $kernel */
$kernel = $app->make(Kernel::class);

/*
Expand Down
98 changes: 54 additions & 44 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,62 +1,70 @@
{
"name": "pyrohost/pyrodactyl",
"description": "Pyrodactyl is the Pterodactyl-based game server panel that's faster, smaller, safer, and more accessible.",
"license": "AGPL-3.0-or-later",
"name": "pterodactyl/panel",
"description": "The free, open-source game management panel. Supporting Minecraft, Spigot, BungeeCord, and SRCDS servers.",
"license": "MIT",
"authors": [
{
"name": "Pyro Host Inc.",
"email": "[email protected]",
"homepage": "https://pyro.host",
"role": "Former Maintainer"
"name": "Matthew Penner",
"email": "[email protected]",
"homepage": "https://github.com/matthewpi",
"role": "Lead Developer"
},
{
"name": "Dane Everitt",
"email": "[email protected]",
"homepage": "https://github.com/DaneEveritt",
"role": "Developer"
}
],
"require": {
"php": "^8.1 || ^8.2",
"php": "^8.2 || ^8.3",
"ext-json": "*",
"ext-mbstring": "*",
"ext-pdo": "*",
"ext-pdo_mysql": "*",
"ext-posix": "*",
"ext-zip": "*",
"aws/aws-sdk-php": "~3.288.1",
"doctrine/dbal": "~3.6.0",
"guzzlehttp/guzzle": "~7.5.0",
"hashids/hashids": "~5.0.0",
"laracasts/utilities": "~3.2.2",
"laravel/framework": "~10.1.3",
"laravel/helpers": "~1.6.0",
"laravel/sanctum": "~3.2.1",
"laravel/tinker": "~2.8.1",
"laravel/ui": "~4.2.1",
"lcobucci/jwt": "~4.3.0",
"league/flysystem-aws-s3-v3": "~3.12.2",
"league/flysystem-memory": "~3.10.3",
"matriphe/iso-639": "~1.2",
"phpseclib/phpseclib": "~3.0.18",
"pragmarx/google2fa": "~8.0.0",
"predis/predis": "~2.1.1",
"prologue/alerts": "~1.1.0",
"aws/aws-sdk-php": "~3.324.7",
"guzzlehttp/guzzle": "~7.9.2",
"hashids/hashids": "~5.0.2",
"laracasts/utilities": "~3.2.3",
"laravel/framework": "~11.31.0",
"laravel/helpers": "~1.7.0",
"laravel/sanctum": "~4.0.3",
"laravel/tinker": "~2.10.0",
"laravel/ui": "~4.5.2",
"lcobucci/jwt": "~5.4.0",
"league/flysystem-aws-s3-v3": "~3.29.0",
"league/flysystem-memory": "~3.29.0",
"matriphe/iso-639": "~2.0",
"phpseclib/phpseclib": "~3.0.42",
"pragmarx/google2fa": "~8.0.3",
"predis/predis": "~2.2.2",
"prologue/alerts": "~1.2.0",
"psr/cache": "~3.0.0",
"s1lentium/iptools": "~1.2.0",
"spatie/laravel-fractal": "~6.0.3",
"spatie/laravel-query-builder": "~5.1.2",
"staudenmeir/belongs-to-through": "~2.13",
"symfony/http-client": "~6.2.6",
"symfony/mailgun-mailer": "~6.2.5",
"symfony/postmark-mailer": "~6.2.5",
"symfony/yaml": "~6.2.5",
"spatie/laravel-fractal": "~6.2.1",
"spatie/laravel-query-builder": "~6.2.1",
"staudenmeir/belongs-to-through": "~2.16.1",
"symfony/http-client": "~7.1.5",
"symfony/mailgun-mailer": "~7.1.3",
"symfony/postmark-mailer": "~7.1.1",
"symfony/yaml": "~7.1.5",
"webmozart/assert": "~1.11.0"
},
"require-dev": {
"barryvdh/laravel-ide-helper": "~2.13.0",
"fakerphp/faker": "~1.21.0",
"friendsofphp/php-cs-fixer": "~3.14.4",
"itsgoingd/clockwork": "~5.1.12",
"laravel/sail": "~1.21.0",
"mockery/mockery": "~1.5.1",
"nunomaduro/collision": "~7.0.5",
"phpunit/phpunit": "~10.0.11",
"spatie/laravel-ignition": "~2.0.0"
"barryvdh/laravel-ide-helper": "~3.2.0",
"fakerphp/faker": "~1.23.1",
"friendsofphp/php-cs-fixer": "~3.64.0",
"itsgoingd/clockwork": "~5.2.2",
"larastan/larastan": "~2.9.9",
"laravel/pail": "~1.1.5",
"laravel/sail": "~1.36.0",
"mockery/mockery": "~1.6.12",
"nunomaduro/collision": "~8.5.0",
"phpstan/phpstan": "~1.12.7",
"phpunit/phpunit": "~10.5.37",
"spatie/laravel-ignition": "~2.8.0"
},
"autoload": {
"files": [
Expand Down Expand Up @@ -84,15 +92,17 @@
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
],
"post-create-project-cmd": [
"@php artisan key:generate --ansi"
"@php artisan key:generate --ansi",
"@php -r \"file_exists('database/database.sqlite') || touch('database/database.sqlite');\"",
"@php artisan migrate --graceful --ansi"
]
},
"config": {
"optimize-autoloader": true,
"preferred-install": "dist",
"sort-packages": true,
"platform": {
"php": "8.1.0"
"php": "8.2.0"
}
},
"minimum-stability": "stable",
Expand Down
Loading

0 comments on commit ada77e9

Please sign in to comment.