Skip to content

Commit

Permalink
fix: update check-same-code-base.yml php and actions version
Browse files Browse the repository at this point in the history
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
  • Loading branch information
skjnldsv committed Jun 7, 2023
1 parent 8bb8262 commit 55716e9
Show file tree
Hide file tree
Showing 68 changed files with 5,801 additions and 2,240 deletions.
14 changes: 8 additions & 6 deletions .github/workflows/check-same-code-base.yml
Expand Up @@ -16,27 +16,29 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: ["8.1"]
php-versions: ["8.2"]

name: check-same-code-base

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2

- name: Set up php ${{ matrix.php-versions }}
uses: shivammathur/setup-php@v2
uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
with:
php-version: ${{ matrix.php-versions }}
coverage: none
ini-file: development
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: check-same-code-base
run: make check-same-code-base

- name: check-updater-phar
run: |
make box
./box info -l updater.phar | grep -v "^Signature Hash" | grep -v "^ Version.php " | grep -v "^Contents: " >updater.old.txt
./vendor/bin/box info -l updater.phar | grep -v "^Signature Hash" | grep -v "^ Version.php " | grep -v "^Contents: " > updater.old.txt
make updater.phar
./box info -l updater.phar | grep -v "^Signature Hash" | grep -v "^ Version.php " | grep -v "^Contents: " >updater.txt
./vendor/bin/box info -l updater.phar | grep -v "^Signature Hash" | grep -v "^ Version.php " | grep -v "^Contents: " > updater.txt
diff updater.txt updater.old.txt
5 changes: 3 additions & 2 deletions .gitignore
Expand Up @@ -2,7 +2,8 @@ box
lib/Version.php
tests/data
tests/vendor
vendor/symfony/console/Tests
vendor/symfony/debug/Tests
/vendor/bamarni/composer-bin-plugin/e2e/
/vendor/symfony/console/Tests
/vendor/symfony/debug/Tests
/vendor-bin/**/vendor
.php-cs-fixer.cache
8 changes: 2 additions & 6 deletions Makefile
@@ -1,13 +1,9 @@
.PHONY: updater.phar

box:
curl -L https://github.com/box-project/box/releases/download/3.11.1/box.phar -o box
chmod +x box

updater.phar: box updater.php lib/*.php buildVersionFile.php
updater.phar: updater.php lib/*.php buildVersionFile.php
php buildVersionFile.php
composer dump-autoload
./box compile -c box.json
composer run box
chmod +x updater.phar
rm lib/Version.php

Expand Down
12 changes: 9 additions & 3 deletions composer.json
Expand Up @@ -19,16 +19,22 @@
"symfony/console": "^4.4"
},
"scripts": {
"box": "box compile -c box.json",
"cs:check": "php-cs-fixer fix --dry-run --diff",
"cs:fix": "php-cs-fixer fix",
"lint": "find . -name \\*.php -not -path './vendor*' -not -path './build/*' -not -path './node_modules/*' -print0 | xargs -0 -n1 php -l",
"post-install-cmd": ["@composer bin all install --ansi"],
"post-update-cmd": ["@composer bin all update --ansi"],
"psalm": "psalm",
"psalm:fix": "psalm --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType",
"psalm:update-baseline": "psalm --threads=1 --update-baseline"
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.5"
"bamarni/composer-bin-plugin": "^1.8"
},
"extra": {
"bamarni-bin": {
"bin-links": true,
"target-directory": "vendor-bin",
"forward-command": true
}
}
}
56 changes: 28 additions & 28 deletions composer.lock

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

Binary file modified updater.phar
Binary file not shown.
5 changes: 5 additions & 0 deletions vendor-bin/box/composer.json
@@ -0,0 +1,5 @@
{
"require-dev": {
"humbug/box": "^3.16"
}
}

0 comments on commit 55716e9

Please sign in to comment.