Merge branch 'main' into update-php-8

Automattic · Jan 31, 2022 · e6f02c3 · e6f02c3
2 parents 2a3199f + c273aa5
commit e6f02c3
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 6 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE
@@ -3,23 +3,48 @@
 <!-- Please have a look at the document on contributing before submitting a pull request: https://github.com/Automattic/vip-go-ci/blob/main/CONTRIBUTING.md -->
 
 <!--
-Pull-Requests should have a TODO included. Here is a draft:
+
+Pull-Requests should have a TODO included. Here are three drafts. Please select the one that applies to the contents of your pull request.
+
+***
+
+Draft for a patch:
+
+TODO:
+- [ ] Add/update unit-tests (if needed)
+- [ ] Check automated unit-tests
+- [ ] Add or update `PHPDoc` comments for new or updated functions (main code only; for VIP)
+- [ ] Changelog entry (for VIP)
+
+***
+
+Draft for a feature pull request:
 
 TODO:
 - [ ] Specify a parameter to make [feature] configurable
 - [ ] Implement [new feature / logic]
 - [ ] Add/update unit-tests
-- [ ] Add or update `PHPDoc` comments for new or updated functions (main code only).
+- [ ] Add or update `PHPDoc` comments for new or updated functions (main code only)
 - [ ] Update README
 - [ ] Changelog entry
 - [ ] Public documentation changes
-- [ ] Run full-unit tests 
 - [ ] Check automated unit-tests
+
+***
+
+Draft for a changelog pull request:
+
+TODO:
+- [ ] Define version number in CHANGELOG.md, add release date and update links
+- [ ] Add same version number in defines.php
+- [ ] Assign a milestone corresponding to the version number to this PR and PRs that will form the release
+- [ ] Run full-unit tests 
 - [ ] Manual testing
   - [ ] Pull request with PHP linting issues
   - [ ] Pull request with PHPCS issues
   - [ ] Pull request without PHPCS issues, not auto-approved
   - [ ] Pull request without PHPCS issues, is auto-approved
   - [ ] Pull request with SVG issues
   - [ ] Pull request with large file to be skipped
+
 -->
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.1.3](https://github.com/Automattic/vip-go-ci/releases/tag/1.1.3) - 2022-01-31
+
+### Added
+- [#239](https://github.com/Automattic/vip-go-ci/pull/239): Define version 1.1.3
+
+## [1.1.2](https://github.com/Automattic/vip-go-ci/releases/tag/1.1.2) - 2022-01-31
+
+### Added
+- [#231](https://github.com/Automattic/vip-go-ci/pull/231): Add CircleCI status badge
+- [#234](https://github.com/Automattic/vip-go-ci/pull/234): Updating README.md, adding CONTRIBUTING.md, updating issue/PR templates
+- [#237](https://github.com/Automattic/vip-go-ci/pull/237): Update vip-go-svg-sanitizer to version 0.9.8
+
 ## [1.1.1](https://github.com/Automattic/vip-go-ci/releases/tag/1.1.1) - 2022-01-11 
 
 ### Updated

diff --git a/defines.php b/defines.php
@@ -4,7 +4,7 @@
  * Version number.
  */
 
-define( 'VIPGOCI_VERSION',		'1.1.1' );
+define( 'VIPGOCI_VERSION',		'1.1.3' );
 
 /*
  * Define minimum version requirements.

diff --git a/tools-init.sh b/tools-init.sh
@@ -35,8 +35,8 @@ export PHP_COMPATIBILITY_PARAGONIE_VER="1.3.1"
 export PHP_COMPATIBILITY_PARAGONIE_SHA1SUM="a51cf3a1af05e6192ce9db6fc90ccb7afd58cb22"
 
 # https://github.com/Automattic/vip-go-svg-sanitizer/releases
-export VIP_GO_SVG_SANITIZER_VER="0.9.7"
-export VIP_GO_SVG_SANITIZER_SHA1SUM="b65d24bec2d7466efaa12b7a04387b7efdd5cbbc"
+export VIP_GO_SVG_SANITIZER_VER="0.9.8"
+export VIP_GO_SVG_SANITIZER_SHA1SUM="558f16dcff6adc4637c1d0287cc6f95fe9ab2ece"
 
 export TMP_LOCK_FILE="$HOME/.vip-go-ci-tools-init.lck"