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

Fix/phpcs #397

Merged
merged 10 commits into from
Oct 25, 2023
Merged
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
6 changes: 3 additions & 3 deletions .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Setup proper PHP version
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
php-version: 8.0

- name: Install Composer dependencies
run: composer install --no-interaction --no-progress --no-suggest --optimize-autoloader
Expand All @@ -34,10 +34,10 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php: [ 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1 ]
php: [ 8.0, 8.1, 8.2, 8.3, 8.4 ]
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: ${{ github.event.inputs.ref }}

Expand Down
Binary file modified .wordpress-org/banner-1544x500.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .wordpress-org/banner-772x250.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .wordpress-org/icon-128x128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .wordpress-org/icon-256x256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion bin/build-zip.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ fi
echo "➤ Preparing zip for $VERSION of $SLUG..."

echo "➤ Building plugin..."
npm install && npm run build
composer install
composer update --no-dev --no-scripts
npm install && npm run build
echo "✓ Plugin built!"

# if directory already exists, delete it
Expand Down
21 changes: 13 additions & 8 deletions bin/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@ fi

echo "Preparing release $VERSION for $SLUG..."

echo "➤ Building plugin..."
npm install && npm run build
composer install
composer update --no-dev --no-scripts
echo "✓ Plugin built!"

# Check if svn user name is provided with -u flag and password with -p flag
while getopts u:p: flag; do
case "${flag}" in
Expand All @@ -36,6 +30,17 @@ if [ -z "$SVN_USER" ] || [ -z "$SVN_PASSWORD" ]; then
exit 1
fi

# Replace the version in readme.txt
sed -i '' "s/Stable tag: .*/Stable tag: $VERSION/" readme.txt
# Replace the version in plugin file
sed -i '' "s/Version: .*/Version: $VERSION/" $SLUG.php

echo "➤ Building plugin..."
npm install && npm run build
composer install
composer update --no-dev --no-scripts
echo "✓ Plugin built!"

# if directory already exists, delete it
if [ -d "$SVN_DIR" ]; then
rm -rf $SVN_DIR
Expand Down Expand Up @@ -63,9 +68,9 @@ find "$SVN_DIR/trunk/" -type d -empty -delete

# Copy assets
# If .wordpress-org is a directory and contains files, copy them to the SVN repo.
if [[ -d "$WORKSPACE/.wordpress-org" ]]; then
if [[ -d "$WORKING_DIR/.wordpress-org" ]]; then
echo "➤ Copying assets..."
rsync -rc "$WORKSPACE/.wordpress-org/" "$SVN_DIR/assets/" --delete --delete-excluded
rsync -rc "$WORKING_DIR/.wordpress-org/" "$SVN_DIR/assets/" --delete --delete-excluded
# Fix screenshots getting force downloaded when clicking them
# https://developer.wordpress.org/plugins/wordpress-org/plugin-assets/
if test -d "$SVN_DIR/assets" && test -n "$(find "$SVN_DIR/assets" -maxdepth 1 -name "*.png" -print -quit)"; then
Expand Down
10 changes: 3 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
"prefer-stable": true,
"minimum-stability": "dev",
"repositories": [
{
"url": "[email protected]:byteever/byteever-sniffs.git",
"type": "github"
},
{
"url": "[email protected]:pluginever/framework-plugin.git",
"type": "github"
Expand All @@ -28,7 +24,7 @@
"php": ">=7.0"
},
"require-dev": {
"byteever/byteever-sniffs": "dev-master",
"byteever/byteever-sniffs": "^1.0",
"codeception/lib-innerbrowser": "^1.0",
"codeception/module-asserts": "^1.1",
"codeception/module-cli": "^1.0",
Expand All @@ -42,9 +38,9 @@
"level-level/wp-browser-woocommerce": "^0.1.8",
"lucatume/wp-browser": "^3.1",
"phpcompatibility/php-compatibility": "9.3.5",
"pluginever/framework-model": "dev-master",
"pluginever/framework-plugin": "dev-master",
"pluginever/framework-settings": "dev-master",
"pluginever/framework-model": "dev-master"
"pluginever/framework-settings": "dev-master"
},
"config": {
"optimize-autoloader": true,
Expand Down
Loading
Loading