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

Version 1.3.4 #170

Open
wants to merge 51 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
b9a388f
Removed 1.3.2.2 warning
soup-bowl Oct 12, 2023
74f1d51
Merge branch 'main' into develop
soup-bowl Oct 12, 2023
b51a18b
Minor changes to docker compose.
soup-bowl Dec 28, 2023
0c70cdb
Update readme.md
soup-bowl Dec 29, 2023
4ae584e
Create dependabot.yml
soup-bowl Jan 9, 2024
fa174bf
Log expiry and visibility (#153, #154)
soup-bowl Jan 9, 2024
bbec254
Update .gitignore
soup-bowl Jan 10, 2024
8a818e2
Codelinting
soup-bowl Jan 11, 2024
3ac57be
Bump the dev-dependencies group with 5 updates
dependabot[bot] Jan 15, 2024
d8e7f7e
Merge pull request #155 from soup-bowl/dependabot/composer/dev-depend…
soup-bowl Jan 19, 2024
41e50bf
Wordpress Coding Linting
soup-bowl Jan 19, 2024
ce273e5
Consolidated UnusedFunctionParameter
soup-bowl Jan 19, 2024
8f0309f
Bump the dev-dependencies group with 1 update
dependabot[bot] Jan 22, 2024
6252eb7
Automatic changelog.
soup-bowl Jan 22, 2024
4c9e881
Remove changelog (because auto)
soup-bowl Jan 22, 2024
a50c35e
Merge pull request #158 from soup-bowl/dependabot/composer/dev-depend…
soup-bowl Jan 22, 2024
1c08967
Merge branch 'develop' into soup-bowl/wpcs-lint-2024-2
soup-bowl Jan 22, 2024
0a72724
Update deploy.yml
soup-bowl Jan 22, 2024
077f80a
Update deploy.yml
soup-bowl Jan 22, 2024
9c019a6
Merge branch 'develop' into soup-bowl/autochangelog
soup-bowl Jan 22, 2024
80c2040
Disabled release zip (#151)
soup-bowl Jan 22, 2024
f0e8cc9
Update deploy.yml
soup-bowl Jan 23, 2024
947548f
Merge pull request #157 from soup-bowl/soup-bowl/wpcs-lint-2024-2
soup-bowl Jan 23, 2024
77f3099
Merge pull request #159 from soup-bowl/soup-bowl/autochangelog
soup-bowl Jan 23, 2024
1763279
Merge pull request #160 from soup-bowl/soup-bowl/151
soup-bowl Jan 23, 2024
c0e9bbe
automatic versioning
soup-bowl Jan 23, 2024
c81edf8
Colour debug indicators.
soup-bowl Jan 23, 2024
577802f
Update readme.md
soup-bowl Mar 3, 2024
9631312
Update readme.md
soup-bowl Mar 3, 2024
66593fa
Bump the dev-dependencies group with 2 updates
dependabot[bot] Apr 1, 2024
0baa49a
Merge pull request #163 from soup-bowl/dependabot/composer/dev-depend…
soup-bowl Apr 1, 2024
30b6a79
Switched mailhog to mailpit.
soup-bowl Apr 3, 2024
2faf01e
Merge branch 'develop' into soup-bowl/log-expiry
soup-bowl Apr 3, 2024
a082b98
Translation-friendlier adjustments
soup-bowl Apr 3, 2024
a9175ae
Update tested flag (#164)
soup-bowl Apr 4, 2024
6dd0b8b
Bump phpunit/phpunit from 9.6.18 to 9.6.19 in the dev-dependencies group
dependabot[bot] Apr 8, 2024
bfe4501
Merge pull request #167 from soup-bowl/dependabot/composer/dev-depend…
soup-bowl Apr 8, 2024
b49757e
Check for post type before deleting.
soup-bowl Jul 14, 2024
3d1730b
Merge branch 'develop' into soup-bowl/log-expiry
soup-bowl Jul 14, 2024
dfbf1ca
Pre-releases don't deploy to WP
soup-bowl Jul 15, 2024
c854309
Merge branch 'develop' into soup-bowl/log-expiry
soup-bowl Jul 19, 2024
13a0838
Merge branch 'develop' into 168-logserviceprune_logs-removes-old-post…
soup-bowl Jul 19, 2024
b6a6573
Merge pull request #165 from soup-bowl/soup-bowl/log-expiry
soup-bowl Jul 21, 2024
4bb86da
Merge pull request #169 from soup-bowl/168-logserviceprune_logs-remov…
soup-bowl Jul 21, 2024
e5406d7
Bump vlucas/phpdotenv from 5.6.0 to 5.6.1 in the dev-dependencies group
dependabot[bot] Jul 22, 2024
daf458a
Fixed date specification in before for prune.
soup-bowl Jul 28, 2024
3139543
Merge pull request #171 from soup-bowl/dependabot/composer/dev-depend…
soup-bowl Jul 28, 2024
38724d8
Removed Docker version declaration.
soup-bowl Jul 28, 2024
7763591
Updated based on plugin check advice.
soup-bowl Jul 29, 2024
0f5a02d
quickstart adjusted for spec URL
soup-bowl Jul 29, 2024
6723e8a
Added SonarQube.
soup-bowl Oct 8, 2024
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
3 changes: 1 addition & 2 deletions .devcontainer/postCreateCommand.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@ fi
docker run --rm --tty --volume $PWD:/app --user $(id -u):$(id -g) composer install --ignore-platform-reqs
docker-compose up -d
echo "Pausing for setup to complete..." && sleep 5
docker-compose exec www wp core install --url="${WP_SITE_URL}" --title="SMTP Dummy" --admin_user="admin" --admin_password="password" --admin_email="[email protected]" --allow-root
docker-compose exec www wp plugin activate simple-smtp --allow-root
docker-compose exec www quickstart "${WP_SITE_URL}"
cp .env.example .env
1 change: 1 addition & 0 deletions .distignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
composer.json
composer.lock
DOCKER_ENV
Dockerfile-php-build
docker_tag
docker-compose.yml
output.log
Expand Down
11 changes: 7 additions & 4 deletions .docker/quickstart.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
#! /bin/bash
wp core install --url="localhost:8080" --title="Development" --admin_user="admin" --admin_password="password" --admin_email="[email protected]" --skip-email --allow-root
if [ "$1" == "ms" ]; then
URL=${1:-localhost:8080}

wp core install --url="${URL}" --title="Development" --admin_user="admin" --admin_password="password" --admin_email="[email protected]" --skip-email --allow-root
if [ "$2" == "ms" ]; then
rm /var/www/html/.htaccess && cp /opt/wpss/htaccess /var/www/html/.htaccess
wp core multisite-install --title="abc" --admin_email="[email protected]" --allow-root
fi

if [ "$1" == "beta" ]; then
if [ "$2" == "beta" ]; then
wp core update --version=nightly --allow-root
fi

wp plugin install wp-crontrol --allow-root
wp plugin install plugin-check --allow-root

wp plugin activate simple-smtp wp-crontrol --allow-root
wp plugin activate simple-smtp wp-crontrol plugin-check --allow-root
6 changes: 3 additions & 3 deletions .docker/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ If no errors occur, you'll now have the following local bindings:
## Quickstart Script
To speed this up even more, I've included a small script that interfaces with [WP CLI][cli] to bypass the 5 minute install process. This will give you a basic functioning WordPress site with typically default development installation choices. The username is **admin** and the password is **password**.

* For a regular install, run `docker-compose exec www quickstart`.
* For a nightly install, run `docker-compose exec www quickstart beta`.
* For a multisite instance, run `docker-compose exec www quickstart ms`.
* For a regular install, run `docker-compose exec www quickstart localhost:8080`.
* For a nightly install, run `docker-compose exec www quickstart localhost:8080 beta`.
* For a multisite instance, run `docker-compose exec www quickstart localhost:8080 ms`.

This **does not setup SMTP**, to avoid impeding testing procedures. You'll still need to do that.

Expand Down
15 changes: 15 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "composer"
directory: "/"
schedule:
interval: "weekly"
groups:
dev-dependencies:
patterns:
- "*"
27 changes: 21 additions & 6 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,32 @@ on:
release:
types: [published]

permissions:
contents: write

jobs:
generate-changelog:
uses: soup-bowl/wordpress-workflows/.github/workflows/generate-changelog.yml@main
with:
repository: soup-bowl/wp-simple-smtp
secrets: inherit

tag:
name: New tag
runs-on: ubuntu-latest
needs: generate-changelog

steps:
- uses: actions/checkout@v3

- name: Update Readme
run: |
# Generate changelog.
echo "${{ needs.generate-changelog.outputs.changelog }}" | base64 --decode >> readme.txt
# Update version number.
sed -i 's/{{VERSION_NUMBER}}/${{ github.event.release.tag_name }}/g' readme.txt
sed -i 's/development-build/${{ github.event.release.tag_name }}/g' wp-simple-smtp.php

- name: Composer Dependencies
uses: php-actions/composer@v6
with:
Expand All @@ -22,18 +40,15 @@ jobs:
id: deploy
uses: 10up/action-wordpress-plugin-deploy@stable
with:
dry-run: ${{ github.event.release.prerelease }}
generate-zip: true
env:
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
SLUG: simple-smtp

- name: Upload release asset
uses: actions/upload-release-asset@v1
run: |
gh release upload ${{ github.event.release.tag_name }} ${{ steps.deploy.outputs.zip-path }} --clobber
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ github.event.release.upload_url }}
asset_path: ${{ steps.deploy.outputs.zip-path }}
asset_name: ${{ github.event.repository.name }}.zip
asset_content_type: application/zip
7 changes: 7 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ jobs:

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0

- uses: sonarsource/sonarqube-scan-action@master
env:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}

- name: Composer Dependencies
uses: php-actions/composer@v6
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
vendor/
.DS_Store
.env
.phpunit.result.cache
.phpunit.result.cache
2 changes: 1 addition & 1 deletion assets/smtp-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const { __ } = wp.i18n;
function wpss_loadin() {
if ( null !== document.getElementById( 'wpss-conf' ) ) {
wpss_load_quicksettings( wpss_qc_settings );
document.getElementById( 'wpss-quickset' ).onchange = function( stuff ) {
document.getElementById( 'wpss-quickset' ).onchange = function ( stuff ) {
wpss_input_selection( wpss_qc_settings, stuff.target.value );
};
}
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
]
},
"require-dev": {
"phpunit/phpunit": "^8",
"phpunit/phpunit": "^9",
"phpmailer/phpmailer": "^6",
"vlucas/phpdotenv": "^5.2",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
"dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
"wp-coding-standards/wpcs": "*"
},
"config": {
Expand Down
Loading
Loading