Skip to content

Commit

Permalink
Merge branch 'develop' into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
dkotter committed Nov 12, 2024
2 parents 282befa + 808dc84 commit eece73b
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 47 deletions.
38 changes: 0 additions & 38 deletions .github/workflows/build-and-tag.yml

This file was deleted.

28 changes: 25 additions & 3 deletions .github/workflows/push-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,34 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup node version and npm cache
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'

- name: Install Node dependencies
run: npm install

- name: Build plugin
run: npm run build

- name: WordPress Plugin Deploy
if: "! github.event.release.prerelease"
id: deploy
uses: 10up/action-wordpress-plugin-deploy@stable
with:
generate-zip: true
env:
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}

- name: Upload release asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ github.event.release.upload_url }}
asset_path: ${{ github.workspace }}/${{ github.event.repository.name }}.zip
asset_name: ${{ github.event.repository.name }}.zip
asset_content_type: application/zip
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file, per [the Ke

## [Unreleased] - TBD

## [2.8.1] - 2024-11-12
### Fixed
- Ensure dependencies are included properly in the release (props [@dkotter](https://github.com/dkotter) via [#315](https://github.com/10up/simple-local-avatars/pull/315)).

## [2.8.0] - 2024-11-12
**Note that this release bumps the minimum required version of WordPress from 6.4 to 6.5.**

Expand Down Expand Up @@ -362,6 +366,8 @@ All notable changes to this project will be documented in this file, per [the Ke
- Initial release

[Unreleased]: https://github.com/10up/simple-local-avatars/compare/trunk...develop
[2.8.1]: https://github.com/10up/simple-local-avatars/compare/2.8.0...2.8.1
[2.8.0]: https://github.com/10up/simple-local-avatars/compare/2.7.11...2.8.0
[2.7.11]: https://github.com/10up/simple-local-avatars/compare/2.7.10...2.7.11
[2.7.10]: https://github.com/10up/simple-local-avatars/compare/2.7.9...2.7.10
[2.7.9]: https://github.com/10up/simple-local-avatars/compare/2.7.8...2.7.9
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "simple-local-avatars",
"version": "2.8.0",
"version": "2.8.1",
"description": "Adds an avatar upload field to user profiles. Generates requested sizes on demand just like Gravatar!",
"license": "GPL-2.0-or-later",
"author": "10up <[email protected]> (https://10up.com)",
Expand Down
5 changes: 4 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Contributors: jakemgold, 10up, thinkoomph, jeffpaul, faisal03
Donate link: https://10up.com/plugins/simple-local-avatars-wordpress/
Tags: avatar, gravatar, user photos, users, profile
Tested up to: 6.7
Stable tag: 2.8.0
Stable tag: 2.8.1
License: GPL-2.0-or-later
License URI: https://spdx.org/licenses/GPL-2.0-or-later.html

Expand Down Expand Up @@ -45,6 +45,9 @@ No. Simple Local Avatars neither collects, stores, nor sends any PII data of vi

== Changelog ==

= 2.8.1 - 2024-11-12 =
* **Fixed:** Ensure dependencies are included properly in the release (props [@dkotter](https://github.com/dkotter) via [#315](https://github.com/10up/simple-local-avatars/pull/315)).

= 2.8.0 - 2024-11-12 =
**Note that this release bumps the minimum required version of WordPress from 6.4 to 6.5.**

Expand Down
4 changes: 2 additions & 2 deletions simple-local-avatars.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: Simple Local Avatars
* Plugin URI: https://10up.com/plugins/simple-local-avatars-wordpress/
* Description: Adds an avatar upload field to user profiles. Generates requested sizes on demand, just like Gravatar! Simple and lightweight.
* Version: 2.8.0
* Version: 2.8.1
* Requires at least: 6.5
* Requires PHP: 7.4
* Author: 10up
Expand Down Expand Up @@ -35,7 +35,7 @@
require_once dirname( __FILE__ ) . '/includes/class-simple-local-avatars.php';

// Global constants.
define( 'SLA_VERSION', '2.8.0' );
define( 'SLA_VERSION', '2.8.1' );
define( 'SLA_PLUGIN_URL', plugin_dir_url( __FILE__ ) );

if ( ! defined( 'SLA_IS_NETWORK' ) ) {
Expand Down

0 comments on commit eece73b

Please sign in to comment.