Skip to content

Commit

Permalink
Release 4.0.0-rc2
Browse files Browse the repository at this point in the history
  • Loading branch information
mlwilkerson committed Dec 11, 2018
1 parent b21cd6e commit d8f809d
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 13 deletions.
15 changes: 11 additions & 4 deletions DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,12 @@ $ svn stat

If there are files with `!` status, that indicates they no longer exist and you should do `svn delete` on each of them.

If there are files with `?` status, that indicates they are being added and you should do `svn add` on each of them.

Pay attention to files under either `wp-svn/assets` or `wp-svn/trunk`.

Do an `svn add` on any _new_ files.
For example, every time the admin client is rebuilt and the bundle content changes, the hashes on the bundle file names
change. So you'll end up removing the old ones and adding the new ones.

If there's an editor dotfile or other directory that should be ignored by `svn`, you can do something like this:

Expand Down Expand Up @@ -277,7 +280,11 @@ From the `wp-svn` dir:
$ svn ci -m 'Release 42.1.2'
```

15. `git add` and `git commit` all that would have been changed so far:
15. Now update the Stable Tag in the `readme.txt` in the git repo

Set it to `42.1.2` the new release tag.

16. `git add` and `git commit` all that would have been changed so far:

- `docs/`
- `admin/build`
Expand All @@ -286,12 +293,12 @@ $ svn ci -m 'Release 42.1.2'
- `admin/package.json`
- `readme.txt`

16. `git push` to GitHub remote
17. `git push` to GitHub remote

Single release commits can be pushed directly to `master`. If there are several commits, push to a topic branch and squash/merge
them into `master` as a single commit.

17. Create a GitHub release that tags that new release commit
18. Create a GitHub release that tags that new release commit

## Run a Local Docs Server

Expand Down
4 changes: 2 additions & 2 deletions admin/build/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"main.css": "/static/css/main.91ed8516.chunk.css",
"main.js": "/static/js/main.7648dcc4.chunk.js",
"main.js.map": "/static/js/main.7648dcc4.chunk.js.map",
"main.js": "/static/js/main.06a5ea7b.chunk.js",
"main.js.map": "/static/js/main.06a5ea7b.chunk.js.map",
"static/js/1.548e2ad2.chunk.js": "/static/js/1.548e2ad2.chunk.js",
"static/js/1.548e2ad2.chunk.js.map": "/static/js/1.548e2ad2.chunk.js.map",
"runtime~main.js": "/static/js/runtime~main.229c360f.js",
Expand Down

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions admin/build/static/js/main.06a5ea7b.chunk.js.map

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion admin/build/static/js/main.7648dcc4.chunk.js.map

This file was deleted.

2 changes: 1 addition & 1 deletion admin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "font-awesome-admin",
"version": "4.0.0-rc1",
"version": "4.0.0-rc2",
"private": true,
"dependencies": {
"@babel/core": "7.1.0",
Expand Down
2 changes: 1 addition & 1 deletion font-awesome.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: Font Awesome
* Plugin URI: https://fontawesome.com/how-to-use/on-the-web/using-with/wordpress
* Description: Adds Font Awesome 5 icons to your WordPress site. Supports Font Awesome Pro. Resolves conflicts across many plugins or themes that use Font Awesome.
* Version: 4.0.0-rc1
* Version: 4.0.0-rc2
* Author: Font Awesome
* Author URI: https://fontawesome.com/
* License: GPLv2 (or later)
Expand Down
2 changes: 1 addition & 1 deletion includes/class-fontawesome.php
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class FontAwesome {
/**
* The version of this WordPress plugin.
*/
const PLUGIN_VERSION = '4.0.0-rc1';
const PLUGIN_VERSION = '4.0.0-rc2';
/**
* The version of this plugin's REST API.
*
Expand Down
6 changes: 5 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
=== Font Awesome ===
Contributors: fontawesome, mlwilkerson, robmadole, rachelbaker
Stable tag: 4.0.0-rc1
Stable tag: 4.0.0-rc2
Tags: font, awesome, fontawesome, font-awesome, icon, svg, webfont
Requires at least: 4.7
Tested up to: 5.0
Expand Down Expand Up @@ -184,6 +184,10 @@ Find the Font Awesome admin settings page either under the "Settings" menu on th

== Changelog ==

= 4.0.0-rc2 =

* Fix handling of v3 deprecation warnings in admin settings page

= 4.0.0-rc1 =

* Add admin settings page
Expand Down

0 comments on commit d8f809d

Please sign in to comment.