Skip to content

Commit

Permalink
Merge pull request #651 from publishpress/release-3.1.7
Browse files Browse the repository at this point in the history
Release 3.1.7
  • Loading branch information
andergmartins authored Jan 4, 2024
2 parents 12b8352 + 785994e commit c97be45
Show file tree
Hide file tree
Showing 27 changed files with 225 additions and 136 deletions.
6 changes: 5 additions & 1 deletion .github/ISSUE_TEMPLATE/release-free-plugin.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ assignees: ''
To release the Free plugin, ensure you complete all the tasks below.

### Pre-release Checklist

- [ ] Create the release branch as `release-<version>` based on the development branch.
- [ ] Review and merge all the relevant Pull Requests into the release branch.
- [ ] Update the version number in the main plugin file and `readme.txt`, adhering to specifications from our [tech documentation](https://rambleventures.slab.com/posts/version-numbers-58nmrk4b), and commit to the release branch.
Expand All @@ -20,18 +21,21 @@ To release the Free plugin, ensure you complete all the tasks below.
- [ ] Run a WP VIP scan with `composer check:phpcs` to ensure no warnings or errors greater than 5 exist.
- [ ] Update the `.pot` file executing `composer gen:pot` and include a note in the changelog.
- [ ] Update the `.mo` files executing `composer gen:mo` and include a note in the changelog.
- [ ] Especially for minor and patch releases, maintain backward compatibility for changes like renamed or moved classes, namespaces, functions, etc. Include deprecation comments and mention this in the changelog. Major releases may remove deprecated code, but always note this in the changelog.- [ ] Update the changelog - make sure all the changes are there with a user-friendly description and that the release date is correct.
- [ ] Especially for minor and patch releases, maintain backward compatibility for changes like renamed or moved classes, namespaces, functions, etc. Include deprecation comments and mention this in the changelog. Major releases may remove deprecated code, but always note this in the changelog.
- [ ] Update the changelog - make sure all the changes are there with a user-friendly description and that the release date is correct.
- [ ] Revise the changelog to include all changes with user-friendly descriptions and ensure the release date is accurate.
- [ ] Confirm there are no uncommitted changes.
- [ ] Build the zip package with `composer build`, creating a new package in the `./dist` directory.
- [ ] Distribute the new package to the team for testing.

### Release Checklist

- [ ] Create and merge a Pull Request for the release branch into the `main` branch.
- [ ] Merge the `main` branch into the `development` branch.
- [ ] Establish the GitHub release on the `main` branch with the correct tag.

#### WP SVN Deployment

- [ ] Navigate to the local copy of the SVN repo for the plugin.
- [ ] Update your working copy using `svn update`.
- [ ] Clear the `trunk` directory with `rm -rf trunk/*`.
Expand Down
5 changes: 4 additions & 1 deletion .github/ISSUE_TEMPLATE/release-pro-plugin.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ assignees: ''
To release the Pro plugin, ensure you complete all the tasks below.

### Pre-release Checklist

- [ ] Create a release branch named `release-<version>` from the development branch.
- [ ] Review and merge all relevant Pull Requests into the release branch.
- [ ] Start a dev-workspace session.
Expand All @@ -23,16 +24,18 @@ To release the Pro plugin, ensure you complete all the tasks below.
- [ ] Update the `.pot` file executing `composer gen:pot` and include a note in the changelog.
- [ ] Especially for minor and patch releases, maintain backward compatibility for changes like renamed or moved classes, namespaces, functions, etc. Include deprecation comments and mention this in the changelog. Major releases may remove deprecated code, but always note this in the changelog.
- [ ] Revise the changelog to include all changes with user-friendly descriptions and ensure the release date is accurate.
-- [ ] Update the version number in the main plugin file and `readme.txt`, adhering to specifications from our [tech documentation](https://rambleventures.slab.com/posts/version-numbers-58nmrk4b), and commit to the release branch.
- [ ] Update the version number in the main plugin file and `readme.txt`, adhering to specifications from our [tech documentation](https://rambleventures.slab.com/posts/version-numbers-58nmrk4b), and commit to the release branch.
- [ ] Confirm there are no uncommitted changes.
- [ ] Build the zip package with `composer build`, creating a new package in the `./dist` directory.
- [ ] Distribute the new package to the team for testing.

### Release Checklist

- [ ] Create and merge a Pull Request for the release branch into the `main` branch.
- [ ] Merge the `main` branch into the `development` branch.
- [ ] Establish the GitHub release on the `main` branch with the correct tag.

#### PublishPress.com Deployment

- [ ] Update the EDD registry on the Downloads menu, uploading the new package.
- [ ] Perform a final test by updating the plugin on a staging site.
8 changes: 4 additions & 4 deletions .github/workflows/code-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
name: Check the code
runs-on: ubuntu-latest
container:
image: publishpress/dev-workspace-terminal:future-free
image: publishpress/dev-workspace-terminal:future-free-2
options: -v ${{ github.workspace }}:/project --workdir="/project"
steps:
- name: Checkout code
Expand All @@ -41,14 +41,14 @@ jobs:
- name: Composer install
run: composer install --no-interaction --no-progress --prefer-dist --ignore-platform-reqs

- name: Fixes scripts permissions
run: chmod +x /project/dev-workspace/docker/scripts/ppbuild

- name: Build the package to a dir
run: composer build:dir

- name: PHPLint - Check PHP syntax errors
run: composer check:lint

- name: PHP - Check PHP compatibility
run: composer check:php

- name: PHPCS - Check VIP scan and code standards
run: composer check:phpcs
1 change: 0 additions & 1 deletion .github/workflows/deploy-wp.org.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install -y iproute2
- name: Checkout code
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion assets/js/block-editor.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/block-editor.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/bulk-edit.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/bulk-edit.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/classic-editor.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/classic-editor.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/quick-edit.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/quick-edit.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/settings-post-types.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/settings-post-types.js.map

Large diffs are not rendered by default.

34 changes: 29 additions & 5 deletions assets/jsx/components/FutureActionPanelClassicEditor.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,36 @@ export const FutureActionPanelClassicEditor = (props) => {
getElementByName('future_action_taxonomy').value = store.getTaxonomy();
}

const getTermsFromElementByName = (name) => {
const element = getElementByName(name);
if (!element) {
return [];
}

let terms = element.value.split(',');

if (terms.length === 1 && terms[0] === '') {
terms = [];
}

return terms.map(term => parseInt(term));
}

const getElementValueByName = (name) => {
const element = getElementByName(name);
if (!element) {
return '';
}

return element.value;
}

const data = {
enabled: getElementByName('future_action_enabled').value === '1',
action: getElementByName('future_action_action').value,
date: getElementByName('future_action_date').value,
terms: getElementByName('future_action_terms').value.split(',').map(term => parseInt(term)),
taxonomy: getElementByName('future_action_taxonomy').value,
enabled: getElementValueByName('future_action_enabled') === '1',
action: getElementValueByName('future_action_action'),
date: getElementValueByName('future_action_date'),
terms: getTermsFromElementByName('future_action_terms'),
taxonomy: getElementValueByName('future_action_taxonomy'),
};

return (
Expand Down
3 changes: 3 additions & 0 deletions assets/jsx/components/PostTypeSettingsPanel.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,9 @@ export const PostTypeSettingsPanel = function (props) {
isLoading={termsSelectIsLoading}
onChange={onChangeTerms}
description={props.text.fieldTermDescription}
maxSuggestions={1000}
expandOnFocus={true}
autoSelectFirstMatch={true}
/>
}
</SettingRow>
Expand Down
4 changes: 3 additions & 1 deletion assets/jsx/components/TokensControl.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,10 @@ export const TokensControl = (props) => {
value={value}
suggestions={props.options}
onChange={onChange}
maxSuggestions={10}
maxSuggestions={props.maxSuggestions}
className="publishpres-future-token-field"
__experimentalExpandOnFocus={props.expandOnFocus}
__experimentalAutoSelectFirstMatch={props.autoSelectFirstMatch}
/>
<input type="hidden" name={props.name} value={stringValue} />

Expand Down
5 changes: 5 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@
"gen:mo": "wp i18n make-mo ./languages ./languages --allow-root",
"gen:pot": "wp i18n make-pot . languages/post-expirator.pot --domain=post-expirator --exclude=dev-workspace,.wordpress-org,.github,dist,tests, --allow-root",
"cleanup:gh-workflows": "user=publishpress repo=publishpress-future; gh api repos/$user/$repo/actions/runs --paginate -q '.workflow_runs[] | select(.head_branch != \"master\") | \"\\(.id)\"' | xargs -n1 -I % gh api --silent repos/$user/$repo/actions/runs/% -X DELETE",
"check": [
"@check:lint",
"@check:php",
"@check:phpcs"
],
"check:longpath": "longpath .",
"check:lint": "phplint",
"check:phpcs": "phpcs",
Expand Down
Loading

0 comments on commit c97be45

Please sign in to comment.