Merge branch 'develop' into trunk

Mather-Sophi · Apr 26, 2021 · 678c36a · 678c36a
2 parents 9da80aa + e591392
commit 678c36a
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 117 deletions.
diff --git a/.github/action-release/Dockerfile b/.github/action-release/Dockerfile
diff --git a/.github/action-release/entrypoint.sh b/.github/action-release/entrypoint.sh
diff --git a/.github/action-release/rsync-filter.txt b/.github/action-release/rsync-filter.txt
diff --git a/.github/workflows/release.yml → .github/workflows/build-docs.yml b/.github/workflows/release.yml → .github/workflows/build-docs.yml
@@ -1,4 +1,4 @@
-name: Build Release
+name: Build Hook Docs
 
 on:
   push:
@@ -22,10 +22,6 @@ jobs:
       run: |
         npm install
         npm run build
-    - name: Release to Stable
-      uses: ./.github/action-release/
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - name: Build hookdocs
       run: npm run build:docs
     - name: Deploy docs update

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -37,9 +37,7 @@ The `develop` branch is the development branch which means it contains the next
 1. Merge: Make a non-fast-forward merge from your release branch to `develop` (or merge the pull request), then do the same for `develop` into `trunk` (`git checkout trunk && git merge --no-ff develop`).  `trunk` contains the stable development version.
 1. Test: While still on the `trunk` branch, test for functionality locally.
 1. Push: Push your `trunk` branch to GitHub (e.g. `git push origin trunk`).
-1. [Wait for build](https://xkcd.com/303/): Head to the [Actions](https://github.com/globeandmail/sophi-for-wordpress/actions) tab in the repo and wait for it to finish if it hasn't already.  If it doesn't succeed, figure out why and start over.
-1. Check the build: Check out the `stable` branch and test for functionality locally.
-1. Release: Create a [new release](https://github.com/globeandmail/sophi-for-wordpress/releases/new), naming the tag and the release with the new version number, and **targeting the `stable` branch**.  Paste the changelog from `CHANGELOG.md` into the body of the release and include a link to the [closed issues on the milestone](https://github.com/globeandmail/sophi-for-wordpress/milestone/#?closed=1).
+1. Release: Create a [new release](https://github.com/globeandmail/sophi-for-wordpress/releases/new), naming the tag and the release with the new version number, and **targeting the `trunk` branch**.  Paste the changelog from `CHANGELOG.md` into the body of the release and include a link to the [closed issues on the milestone](https://github.com/globeandmail/sophi-for-wordpress/milestone/#?closed=1).
 1. Close the milestone: Edit the [milestone](https://github.com/globeandmail/sophi-for-wordpress/milestone/#) with release date (in the `Due date (optional)` field) and link to GitHub release (in the `Description` field), then close the milestone.
 1. Punt incomplete items: If any open issues or PRs which were milestoned for `X.Y.Z` do not make it into the release, update their milestone to `X+1.0.0`, `X.Y+1.0`, `X.Y.Z+1`, or `Future Release`.
 1. Version bump (again): In the `develop` branch (`cd ../ && git checkout develop`) bump the version number in `sophi.php` to `X.Y.(Z+1)-dev`.  It's okay if the next release might be a different version number; that change can be handled right before release in the first step, as might also be the case with ``@since` annotations.
diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ Sophi-driven pages outperform human curated pages by a significant margin and fr
 *Note that if you are on the [WordPress VIP](https://wpvip.com/) platform that you will not be able to upload a plugin in the WordPress Admin so you will need to follow steps in 1b.*
 
 ### 1a. Download plugin ZIP file and upload to your site.
-You can upload and install the [archived (zip) plugin](https://github.com/globeandmail/sophi-for-wordpress/archive/stable.zip) via the WordPress dashboard (`Plugins` > `Add New` -> `Upload Plugin`) or manually inside of the `wp-content/plugins` directory, and activate on the Plugins dashboard.
+You can upload and install the [plugin ZIP file](https://downloads.wordpress.org/plugin/sophi.zip) via the WordPress dashboard (`Plugins` > `Add New` -> `Upload Plugin`) or manually inside of the `wp-content/plugins` directory, and activate on the Plugins dashboard.
 
 ### 1b. Download or Clone this repo, install dependencies, and build.
 - `git clone https://github.com/globeandmail/sophi-for-wordpress.git && cd sophi-for-wordpress`

diff --git a/readme.txt b/readme.txt
@@ -34,7 +34,7 @@ Sophi-driven pages outperform human curated pages by a significant margin and fr
 *Note that if you are on the [WordPress VIP](https://wpvip.com/) platform that you will not be able to upload a plugin in the WordPress Admin so you will need to follow steps in 1b.*
 
 1a Download plugin ZIP file and upload to your site.
-You can upload and install the [archived (zip) plugin](https://github.com/globeandmail/sophi-for-wordpress/archive/stable.zip) via the WordPress dashboard (`Plugins` > `Add New` -> `Upload Plugin`) or manually inside of the `wp-content/plugins` directory, and activate on the Plugins dashboard.
+You can upload and install the [plugin ZIP file](https://downloads.wordpress.org/plugin/sophi.zip) via the WordPress dashboard (`Plugins` > `Add New` -> `Upload Plugin`) or manually inside of the `wp-content/plugins` directory, and activate on the Plugins dashboard.
 
 1b Download or Clone this repo, install dependencies, and build.
 - `git clone https://github.com/globeandmail/sophi-for-wordpress.git && cd sophi-for-wordpress`