Skip to content
This repository has been archived by the owner on Aug 2, 2024. It is now read-only.

Release 0.3.0-alpha1 #100

Merged
merged 72 commits into from
Jun 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
063b9f7
bump version
jazzsequence Apr 11, 2022
51b0cf7
Version 0.2.18.
jazzsequence Apr 12, 2022
bb91f62
Bump versions to 0.2.17 and current stable 0.2.16
jazzsequence Apr 12, 2022
1256587
Bump versions to 0.2.17 and current stable 0.2.16
jazzsequence Apr 12, 2022
3c083d7
add a pre and post release composer script
jazzsequence Apr 12, 2022
10b5930
add the pre and post release scripts
jazzsequence Apr 12, 2022
4c7fd56
update contributing.md with automated release process
jazzsequence Apr 12, 2022
9623662
Revert "Version 0.2.18."
jazzsequence Apr 12, 2022
1c8c257
Merge branch 'main' into script-pre-and-post-release-process
jazzsequence Apr 12, 2022
217cfe1
Merge pull request #97 from pantheon-systems/script-pre-and-post-rele…
jazzsequence Apr 13, 2022
d4947d4
prevent errors by ensuring data is an array (if empty)
jazzsequence May 27, 2022
7cfcea6
add new get_interest_header_key function & filter
jazzsequence May 27, 2022
b78bcdd
use the new get_interest_header_key function
jazzsequence May 27, 2022
d33eacc
test the new interest header key
jazzsequence May 27, 2022
3d6a6b0
use the new get_interest_header_key function in tests
jazzsequence May 27, 2022
d1c5f4c
use HTTP_P13N_INTEREST in mock data
jazzsequence May 27, 2022
f139515
remove old supported headers & replace with new
jazzsequence May 27, 2022
c7314c6
use updated default headers
jazzsequence May 27, 2022
3b622ba
update allowed values
jazzsequence May 31, 2022
cae886e
update allowed values docblock
jazzsequence May 31, 2022
3ecea0d
update default header to pull
jazzsequence May 31, 2022
baa2134
add a new allowed headers function
jazzsequence May 31, 2022
cb1378c
the data being passed in should be last
jazzsequence May 31, 2022
610f583
remove the header parameter
jazzsequence May 31, 2022
6624cbb
header validation is happening in get_geo_allowed_headers
jazzsequence May 31, 2022
bb87d4b
remove latlon
jazzsequence May 31, 2022
586b8c6
remove before_get_geo
jazzsequence May 31, 2022
22d9eec
remove old handling for all geo
jazzsequence May 31, 2022
c0db031
remove empty geo handling
jazzsequence May 31, 2022
9b97a24
just return the requested data
jazzsequence May 31, 2022
85f255f
if no data value is passed, get and return all geo data
jazzsequence May 31, 2022
97756be
restore composer.json to previous
jazzsequence May 31, 2022
8779496
restore composer.lock to original
jazzsequence May 31, 2022
9dc811d
normalize data type
jazzsequence Jun 1, 2022
f080208
build the header name based on the data type
jazzsequence Jun 1, 2022
4427f76
convert headers to expected case
jazzsequence Jun 1, 2022
9f8c411
fix mock dat
jazzsequence Jun 1, 2022
33a6a88
update/fix tests
jazzsequence Jun 1, 2022
1821da6
if data type is empty, don't validate the headers
jazzsequence Jun 1, 2022
382926b
fix empty geo test
jazzsequence Jun 1, 2022
f49f12f
pass the uppercased header names to the global library to parse
jazzsequence Jun 1, 2022
8513305
filter the all geo data to match what we're getting from mock data
jazzsequence Jun 1, 2022
c1f016b
test that the json-encoded strings match
jazzsequence Jun 1, 2022
5751be3
build the parsed data to match against all geo data
jazzsequence Jun 1, 2022
01b00fb
allow specific groups to be tested separately
jazzsequence Jun 1, 2022
d8c9686
we can get all the data we need from the personalization object
jazzsequence Jun 1, 2022
843e586
city should go before region logically
jazzsequence Jun 1, 2022
f027afc
add a helper function to format mock data
jazzsequence Jun 1, 2022
0f17453
update the test so we don't need to use a filter
jazzsequence Jun 1, 2022
e387dd5
add phpunit groups for the other geo tests
jazzsequence Jun 1, 2022
8714980
fix city/region order in test data
jazzsequence Jun 1, 2022
f131e1d
fix header name mock data
jazzsequence Jun 1, 2022
23c6c76
parsed_geo_data doesn't exist anymore
jazzsequence Jun 1, 2022
e31f7b3
there is no before_get_geo action anymore
jazzsequence Jun 1, 2022
eafeb15
test filtering the country name
jazzsequence Jun 1, 2022
f2b5586
update to not use parsed_geo_data filter
jazzsequence Jun 1, 2022
c5f2944
use the new alpha release of the global library
jazzsequence Jun 2, 2022
7968e32
add some test headers
jazzsequence Jun 2, 2022
3b11733
change the value to test to something that hasn't been set elsewhere
jazzsequence Jun 2, 2022
38987c0
get the interest header key as the cookie key
jazzsequence Jun 3, 2022
5a6a308
backwards compatibility support for country and continent
jazzsequence Jun 3, 2022
281b67b
add return to docblock
jazzsequence Jun 7, 2022
1803e30
remove todo
jazzsequence Jun 7, 2022
02c2dae
Merge pull request #98 from pantheon-systems/ei-220-update-p13n-headers
jazzsequence Jun 8, 2022
d7b29c7
update the release script
jazzsequence Jun 8, 2022
1a2c7b2
fix release script
jazzsequence Jun 8, 2022
6847c14
Merge pull request #99 from pantheon-systems/update-release-script
jazzsequence Jun 8, 2022
1323cb4
Merge branch 'main' into branches/0.3.x
jazzsequence Jun 8, 2022
0bd6c27
Bump version to 0.3.0-alpha1
jazzsequence Jun 8, 2022
6dbc9d8
Merge branch 'build' into release-0.3.0-alpha1
jazzsequence Jun 8, 2022
a4cb7a0
Merge 6dbc9d892d879699568cc6d95f201989798ba2a2 into 3b8c37e67564372b9…
jazzsequence Jun 8, 2022
bf568ff
Built assets
Jun 8, 2022
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
14 changes: 14 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,20 @@ Combinations of these tools can be built into the `RoboFile.php`, e.g. spinning

## Release Process

### Automated
1. Merge all production-ready code into `main`.
2. Run `composer release:pre`. This will prompt for the release number, bump all the versions to that version, and push a new `release-major.minor.patch` version branch.
3. Create a PR against the `build` branch.
4. After all tests and code reviews pass (including resolving any merge conflicts) and automation makes the commit containing the build files, merge the PR into `build`.
5. Navigate to the [Releases](https://github.com/pantheon-systems/pantheon-wordpress-edge-integrations/releases) page and click the "Draft a New Release" button.
7. Under "Choose a Tag", enter the release version (`major.minor.patch`) and select "Create a new tag: `major.minor.patch` on publish".
8. Set the target branch to `build`.
9. Enter the version number as the release title.
10. Click the "Auto-generate release notes" button to add the changelog to the release.
11. Publish the release!
12. Run `composer release:post`. This will prompt for the current stable release and the next version number and bump the readme to the current stable, and all other versions to the next version. This is intended to be pushed to `main` after the release is published.

### Manual
1. Merge all production-ready code into `main`.
2. On your local machine, checkout `main` and pull the latest.
3. Checkout a new release branch: `git checkout -b release-major.minor.patch` and bump the version number in [pantheon-wordpress-edge-integrations.php](https://github.com/pantheon-systems/pantheon-wordpress-edge-integrations/blob/main/pantheon-wordpress-edge-integrations.php#L7), and [package.json](https://github.com/pantheon-systems/pantheon-wordpress-edge-integrations/blob/main/package.json#L3)
Expand Down
17 changes: 9 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@
"minimum-stability": "dev",
"prefer-stable": true,
"repositories": [
{
"type": "composer",
"url": "https://packagist.org"
},
{
"type": "path",
"url": "packages/*",
"symlink": true
},
{
"type": "composer",
"url": "https://packagist.org"
},
{
"type": "git",
"url": "https://github.com/wordpress/wordpress-develop.git"
}
],
"require": {
"pantheon-systems/pantheon-edge-integrations": "^v1.0"
"pantheon-systems/pantheon-edge-integrations": "^v1.1.0-alpha1"
},
"require-dev": {
"consolidation/robo": "^3.0",
Expand All @@ -40,14 +40,15 @@
]
},
"scripts": {
"bump:patch": "npm run bump:patch",
"bump:minor": "npm run bump:minor",
"bump:major": "npm run bump:major",
"release:pre": "bash scripts/pre-release",
"release:post": "bash scripts/post-release",
"lint:php": "find ./pantheon-wordpress-edge-integrations.php ./inc ./tests -name '*.php' -exec php -l {} \\;",
"lint:phpcs": "vendor/bin/phpcs -s --standard=phpcs.ruleset.xml .",
"lint:phpcbf": "vendor/bin/phpcbf -s --standard=phpcs.ruleset.xml .",
"lint": "composer lint:php && composer lint:phpcs",
"test:unit": "vendor/bin/phpunit -c phpunit.xml",
"test:geo": "vendor/bin/phpunit -c phpunit.xml --group wp-geo",
"test:interest": "vendor/bin/phpunit -c phpunit.xml --group wp-interest",
"test": "composer test:unit"
},
"config": {
Expand Down
Loading