Skip to content

Commit 3f835b0

Browse files
SimonDevelopSimonDevelop
committed
Merge branch 'develop'
2 parents a8984b0 + edced94 commit 3f835b0

File tree

19 files changed

+1976
-1997
lines changed

19 files changed

+1976
-1997
lines changed

‎.github/workflows/create_release.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Upload the latest release
2+
3+
on:
4+
push:
5+
tags: ["*"]
6+
7+
jobs:
8+
create:
9+
name: "Creates the newest release by version"
10+
runs-on: "ubuntu-latest"
11+
12+
steps:
13+
- name: Checkout project
14+
uses: actions/checkout@v2.3.4
15+
with:
16+
fetch-depth: 0
17+
18+
- name: Set up Docker Build
19+
uses: docker/setup-buildx-action@v2
20+
21+
- name: Login to DockerHub
22+
uses: docker/login-action@v2
23+
with:
24+
username: ${{ secrets.DOCKERHUB_USERNAME }}
25+
password: ${{ secrets.DOCKERHUB_TOKEN }}
26+
27+
- name: Get version from tag
28+
id: get_version
29+
run: echo "::set-output name=version::${GITHUB_REF#refs/tags/}"
30+
31+
- name: Build and push Docker image
32+
uses: docker/build-push-action@v3
33+
with:
34+
push: true
35+
context: docker/Dockerfile
36+
platforms: linux/amd64,linux/arm64,linux/arm/v7
37+
tags: |
38+
simondockerise/gsm:latest
39+
simondockerise/gsm:${{ steps.get_version.outputs.version }}

‎.github/workflows/php.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
matrix:
1010
operating-system: [ubuntu-latest]
11-
php-versions: ['8.2', '8.3']
11+
php-versions: ['8.3', '8.4']
1212
name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
1313
env:
1414
APP_LANG: 'en'

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
[![version](https://img.shields.io/badge/Version-1.0.2-brightgreen.svg)](https://github.com/SimonDevelop/game-server-manager/releases/tag/1.0.2)
2-
[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%208.2-8892BF.svg)](https://php.net/)
1+
[![version](https://img.shields.io/badge/Version-1.1.0-brightgreen.svg)](https://github.com/SimonDevelop/game-server-manager/releases/tag/1.1.0)
2+
[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%208.3-8892BF.svg)](https://php.net/)
33
[![Github Actions PHP](https://github.com/SimonDevelop/game-server-manager/workflows/PHP/badge.svg)](https://github.com/SimonDevelop/game-server-manager/actions)
44
[![GitHub license](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/SimonDevelop/game-server-manager/blob/master/LICENSE)
55

‎composer.json‎

Lines changed: 51 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -6,62 +6,62 @@
66
"minimum-stability": "stable",
77
"prefer-stable": true,
88
"require": {
9-
"php": ">=8.2",
9+
"php": ">=8.3",
1010
"ext-ctype": "*",
1111
"ext-iconv": "*",
12-
"doctrine/doctrine-bundle": "^2.11",
13-
"doctrine/doctrine-migrations-bundle": "^3.3",
14-
"doctrine/orm": "^2.17",
15-
"phpdocumentor/reflection-docblock": "^5.3",
12+
"doctrine/doctrine-bundle": "^2.13",
13+
"doctrine/doctrine-migrations-bundle": "^3.4",
14+
"doctrine/orm": "^3.3",
15+
"phpdocumentor/reflection-docblock": "^5.6",
1616
"phpseclib/phpseclib": "^3.0",
17-
"runtime/frankenphp-symfony": "^0.1.1",
18-
"symfony/asset": "6.4.*",
19-
"symfony/console": "6.4.*",
20-
"symfony/doctrine-messenger": "6.4.*",
21-
"symfony/dotenv": "6.4.*",
22-
"symfony/expression-language": "6.4.*",
17+
"runtime/frankenphp-symfony": "^0.2",
18+
"symfony/asset": "7.2.*",
19+
"symfony/console": "7.2.*",
20+
"symfony/doctrine-messenger": "7.2.*",
21+
"symfony/dotenv": "7.2.*",
22+
"symfony/expression-language": "7.2.*",
2323
"symfony/flex": "^2.4",
24-
"symfony/form": "6.4.*",
25-
"symfony/framework-bundle": "6.4.*",
26-
"symfony/http-client": "6.4.*",
27-
"symfony/intl": "6.4.*",
28-
"symfony/mailer": "6.4.*",
29-
"symfony/messenger": "6.4.*",
30-
"symfony/mime": "6.4.*",
24+
"symfony/form": "7.2.*",
25+
"symfony/framework-bundle": "7.2.*",
26+
"symfony/http-client": "7.2.*",
27+
"symfony/intl": "7.2.*",
28+
"symfony/mailer": "7.2.*",
29+
"symfony/messenger": "7.2.*",
30+
"symfony/mime": "7.2.*",
3131
"symfony/monolog-bundle": "^3.10",
32-
"symfony/notifier": "6.4.*",
33-
"symfony/process": "6.4.*",
34-
"symfony/property-access": "6.4.*",
35-
"symfony/property-info": "6.4.*",
32+
"symfony/notifier": "7.2.*",
33+
"symfony/process": "7.2.*",
34+
"symfony/property-access": "7.2.*",
35+
"symfony/property-info": "7.2.*",
3636
"symfony/proxy-manager-bridge": "^6.4",
37-
"symfony/runtime": "6.4.*",
38-
"symfony/security-bundle": "6.4.*",
39-
"symfony/serializer": "6.4.*",
40-
"symfony/string": "6.4.*",
41-
"symfony/translation": "6.4.*",
42-
"symfony/twig-bundle": "6.4.*",
43-
"symfony/ux-autocomplete": "^2.13",
44-
"symfony/ux-chartjs": "^2.13",
45-
"symfony/validator": "6.4.*",
46-
"symfony/web-link": "6.4.*",
47-
"symfony/webpack-encore-bundle": "^2.1",
48-
"symfony/yaml": "6.4.*",
37+
"symfony/runtime": "7.2.*",
38+
"symfony/security-bundle": "7.2.*",
39+
"symfony/serializer": "7.2.*",
40+
"symfony/string": "7.2.*",
41+
"symfony/translation": "7.2.*",
42+
"symfony/twig-bundle": "7.2.*",
43+
"symfony/ux-autocomplete": "^2.22",
44+
"symfony/ux-chartjs": "^2.22",
45+
"symfony/validator": "7.2.*",
46+
"symfony/web-link": "7.2.*",
47+
"symfony/webpack-encore-bundle": "^2.2",
48+
"symfony/yaml": "7.2.*",
4949
"tiben/crontab-manager": "^1.4",
50-
"twig/extra-bundle": "^3.5",
51-
"twig/twig": "^3.5"
50+
"twig/extra-bundle": "^3.19",
51+
"twig/twig": "^3.19"
5252
},
5353
"require-dev": {
54-
"phpstan/extension-installer": "^1.3",
55-
"phpstan/phpstan-symfony": "^1.3",
56-
"phpunit/phpunit": "^9.6",
57-
"symfony/browser-kit": "6.4.*",
58-
"symfony/css-selector": "6.4.*",
59-
"symfony/debug-bundle": "6.4.*",
60-
"symfony/maker-bundle": "^1.52",
61-
"symfony/phpunit-bridge": "6.4.*",
62-
"symfony/stopwatch": "6.4.*",
63-
"symfony/var-dumper": "6.4.*",
64-
"symfony/web-profiler-bundle": "6.4.*"
54+
"phpstan/extension-installer": "^1.4",
55+
"phpstan/phpstan-symfony": "^2.0",
56+
"phpunit/phpunit": "^11.5",
57+
"symfony/browser-kit": "7.2.*",
58+
"symfony/css-selector": "7.2.*",
59+
"symfony/debug-bundle": "7.2.*",
60+
"symfony/maker-bundle": "^1.62",
61+
"symfony/phpunit-bridge": "7.2.*",
62+
"symfony/stopwatch": "7.2.*",
63+
"symfony/var-dumper": "7.2.*",
64+
"symfony/web-profiler-bundle": "7.2.*"
6565
},
6666
"config": {
6767
"optimize-autoloader": true,
@@ -94,7 +94,9 @@
9494
"symfony/polyfill-php74": "*",
9595
"symfony/polyfill-php80": "*",
9696
"symfony/polyfill-php81": "*",
97-
"symfony/polyfill-php82": "*"
97+
"symfony/polyfill-php82": "*",
98+
"symfony/polyfill-php83": "*",
99+
"symfony/polyfill-php84": "*"
98100
},
99101
"scripts": {
100102
"auto-scripts": {
@@ -115,7 +117,7 @@
115117
"extra": {
116118
"symfony": {
117119
"allow-contrib": false,
118-
"require": "6.4.*",
120+
"require": "7.2.*",
119121
"docker": false
120122
},
121123
"runtime": {

0 commit comments

Comments
 (0)