Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump actions/checkout from 3 to 4 #118

Open
wants to merge 2 commits into
base: quic
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 11 additions & 17 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,24 @@ jobs:

steps:
- name: Startup
uses: actions/checkout@v3
- name: Checkout PharBuilder
uses: actions/checkout@v3
with:
repository: NetherGamesMC/PharBuilder
token: ${{ secrets.ng_token }}
path: PharBuilder
ref: pm5
uses: actions/checkout@v4
- name: Install FFI
run: sudo apt install -y libffi7
- name: Download PHP Release
uses: dsaltares/[email protected].0
uses: dsaltares/[email protected].2
with:
file: Linux.zip
file: PHP-Linux-x86_64-PM5.tar.gz
repo: NetherGamesMC/php-build-scripts
version: "tags/8.2-pm5"
version: "tags/php-8.3-ffi-latest"
token: ${{ secrets.GITHUB_TOKEN }}
- name: Unpack PHP Release
run: unzip Linux.zip && tar -xzvf PHP_Linux-x86_64.tar.gz
run: tar -xzvf PHP-Linux-x86_64-PM5.tar.gz
- name: Download Composer
run: curl -o ./bin/composer.phar "https://getcomposer.org/composer-stable.phar"
- name: Install Composer dependencies
run: |
./bin/php7/bin/php ./bin/composer.phar install --prefer-dist --no-interaction --no-dev
run: ./bin/php7/bin/php ./bin/composer.phar install --prefer-dist --no-interaction --no-dev
- name: Download pharbuilder-rs
uses: dsaltares/[email protected].0
uses: dsaltares/[email protected].2
with:
file: pharbuilder
repo: NetherGamesMC/pharbuilder-rs
Expand All @@ -42,10 +36,10 @@ jobs:
run: |
echo Building...
chmod +x pharbuilder
./pharbuilder -i . -o PharBuilder/ProxyTransport.phar
./pharbuilder -i . -o ./ProxyTransport.phar
echo Build completed!
- name: Upload
uses: actions/upload-artifact@v3
with:
name: ProxyTransport
path: PharBuilder/ProxyTransport.phar
path: ProxyTransport.phar
16 changes: 9 additions & 7 deletions .github/workflows/phpstan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,21 @@ jobs:

steps:
- name: Startup
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install FFI
run: sudo apt install -y libffi7
- name: Download PHP Release
uses: dsaltares/[email protected].0
uses: dsaltares/[email protected].2
with:
file: Linux.zip
file: PHP-Linux-x86_64-PM5.tar.gz
repo: NetherGamesMC/php-build-scripts
version: "tags/8.2-pm5"
version: "tags/php-8.3-ffi-latest"
token: ${{ secrets.GITHUB_TOKEN }}
- name: Unpack PHP Release
run: unzip Linux.zip && tar -xzvf PHP_Linux-x86_64.tar.gz
run: tar -xzvf PHP-Linux-x86_64-PM5.tar.gz
- name: Download Composer
run: curl -o composer.phar "https://getcomposer.org/composer-stable.phar"
run: curl -o ./bin/composer.phar "https://getcomposer.org/composer-stable.phar"
- name: Install Composer dependencies
run: ./bin/php7/bin/php composer.phar install --prefer-dist --no-interaction
run: ./bin/php7/bin/php ./bin/composer.phar install --prefer-dist --no-interaction
- name: Run PHPStan
run: ./bin/php7/bin/php vendor/bin/phpstan.phar analyze --no-progress
8 changes: 5 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,17 @@
"php": "^8.1",
"ext-pmmpthread": "^6.0.1",
"ext-sockets": "*",
"nethergamesmc/libproxy": "dev-tcp"
"nethergamesmc/libproxy": "dev-pm5",
"nethergamesmc/quiche": "dev-master"
},
"require-dev": {
"phpstan/phpstan": "1.10.8",
"nethergamesmc/pocketmine-mp": "dev-stable"
},
"repositories": [
{ "type": "vcs", "url": "[email protected]:NetherGamesMC/libproxy.git" },
{ "type": "vcs", "url": "[email protected]:NetherGamesMC/PocketMine-MP.git" }
{ "type": "vcs", "url": "[email protected]:NetherGamesMC/PHP-Quiche.git" },
{ "type": "vcs", "url": "[email protected]:NetherGamesMC/PocketMine-MP.git" },
{ "type": "vcs", "url": "[email protected]:NetherGamesMC/libproxy.git" }
],
"autoload": {
"psr-4": {
Expand Down
210 changes: 202 additions & 8 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion plugin.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: ProxyTransport
version: 1.0
version: 1.1.0
main: NetherGames\ProxyTransport\ProxyTransport
api: [4.18.0]
author: NetherGamesMC
Loading