From 1813be6ad570c138c4a9574ac1536128ceee67ad Mon Sep 17 00:00:00 2001 From: Darin Kotter Date: Tue, 12 Nov 2024 11:30:16 -0700 Subject: [PATCH 1/3] Remove our build and tag workflow and add our build steps into our deploy workflow --- .github/workflows/build-and-tag.yml | 38 ----------------------------- .github/workflows/push-deploy.yml | 28 ++++++++++++++++++--- 2 files changed, 25 insertions(+), 41 deletions(-) delete mode 100644 .github/workflows/build-and-tag.yml diff --git a/.github/workflows/build-and-tag.yml b/.github/workflows/build-and-tag.yml deleted file mode 100644 index c7376f2b..00000000 --- a/.github/workflows/build-and-tag.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: Build and Tag -on: - push: - branches: - - 'trunk' - -jobs: - wordpress: - name: Release - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Install Composer dependencies - run: composer install --no-dev - - - name: Install Dependencies - run: npm install - - - name: Build Assets - run: npm run build - - - name: Setup - run: 'echo "VERSION=$(grep -Po ''\"version\": \"[0-9\\.]+\"'' package.json | grep -Po ''[0-9\\.]+'')" >> $GITHUB_ENV' - - - name: Tag - run: | - echo "Releasing version $VERSION ..." - git config user.name github-actions - git config user.email github-actions@github.com - git checkout -b "release-$VERSION" - git add -f dist/* - git commit -m "Release $VERSION" - git tag "$VERSION" - git push --tags - env: - TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/push-deploy.yml b/.github/workflows/push-deploy.yml index e12fc943..a511eef5 100644 --- a/.github/workflows/push-deploy.yml +++ b/.github/workflows/push-deploy.yml @@ -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 }} \ No newline at end of file + 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 \ No newline at end of file From db0137f96909b7bf5ff7ec0d4a3a33148487ea3e Mon Sep 17 00:00:00 2001 From: Darin Kotter Date: Tue, 12 Nov 2024 11:35:17 -0700 Subject: [PATCH 2/3] Version bump to 2.8.1 --- package-lock.json | 4 ++-- package.json | 2 +- readme.txt | 2 +- simple-local-avatars.php | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8341bb3d..2835f257 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "simple-local-avatars", - "version": "2.8.0", + "version": "2.8.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "simple-local-avatars", - "version": "2.8.0", + "version": "2.8.1", "license": "GPL-2.0-or-later", "devDependencies": { "@10up/cypress-wp-utils": "^0.2.0", diff --git a/package.json b/package.json index 90883a86..38364184 100644 --- a/package.json +++ b/package.json @@ -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 (https://10up.com)", diff --git a/readme.txt b/readme.txt index 5df9d583..542dd108 100644 --- a/readme.txt +++ b/readme.txt @@ -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 diff --git a/simple-local-avatars.php b/simple-local-avatars.php index 9b131de0..b9b8560c 100644 --- a/simple-local-avatars.php +++ b/simple-local-avatars.php @@ -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 @@ -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' ) ) { From c32459add1189513611b0236ab49b400df3f515a Mon Sep 17 00:00:00 2001 From: Darin Kotter Date: Tue, 12 Nov 2024 11:37:34 -0700 Subject: [PATCH 3/3] Update changelogs --- CHANGELOG.md | 6 ++++++ readme.txt | 3 +++ 2 files changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4c2fd92..43a95276 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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.** @@ -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 diff --git a/readme.txt b/readme.txt index 542dd108..5f47a021 100644 --- a/readme.txt +++ b/readme.txt @@ -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.**