Skip to content

Commit

Permalink
Merge pull request #2175 from Varying-Vagrant-Vagrants/develop
Browse files Browse the repository at this point in the history
3.4.1 release
  • Loading branch information
tomjn authored Jun 4, 2020
2 parents a923402 + d2dca43 commit 4317d11
Show file tree
Hide file tree
Showing 35 changed files with 1,496 additions and 878 deletions.
76 changes: 76 additions & 0 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, sex characteristics, gender identity and expression,
level of experience, education, socio-economic status, nationality, personal
appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at [email protected]. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see
https://www.contributor-covenant.org/faq
67 changes: 67 additions & 0 deletions .github/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
# Configuration for update-docs - https://github.com/behaviorbot/update-docs

# Comment to be posted to on PRs that don't update documentation
updateDocsComment: >
Thanks for opening this pull request! Make sure `CHANGELOG.md` gets updated with this change, additionally any docs that need updated can be found at https://github.com/Varying-Vagrant-Vagrants/varyingvagrantvagrants.org
targetFiles:
- CHANGELOG.md

# Comment to be posted to on first time issues
newIssueWelcomeComment: >
Thanks for opening your first issue here! Be sure to follow the issue template and include your OS/Vagrant/VVV versions! Don't forget you can get support in the VVV slack at https://varyingvagrantvagrants.org/docs/en-US/slack/
# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome

# Comment to be posted to on PRs from first time contributors in your repository
newPRWelcomeComment: false

# Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge

# Comment to be posted to on pull requests merged by a first time user
firstPRMergeComment: >
Congrats on merging your first pull request!
# Configuration for request-info - https://github.com/behaviorbot/request-info

# *OPTIONAL* Comment to reply with
# Can be either a string :
requestInfoReplyComment: >
Thanks for contributing, it would be a help if you can provide us with more info!
# Or an array:
# requestInfoReplyComment:
# - Ah no! young blade! That was a trifle short!
# - Tell me more !
# - I am sure you can be more effusive


# *OPTIONAL* default titles to check against for lack of descriptiveness
# MUST BE ALL LOWERCASE
requestInfoDefaultTitles:
- update readme.md
- updates

# *OPTIONAL* Label to be added to Issues and Pull Requests with insufficient information given
requestInfoLabelToAdd: needs-more-info

# *OPTIONAL* Require Issues to contain more information than what is provided in the issue templates
# Will fail if the issue's body is equal to a provided template
checkIssueTemplate: true

# *OPTIONAL* Require Pull Requests to contain more information than what is provided in the PR template
# Will fail if the pull request's body is equal to the provided template
checkPullRequestTemplate: true

# *OPTIONAL* Only warn about insufficient information on these events type
# Keys must be lowercase. Valid values are 'issue' and 'pullRequest'
requestInfoOn:
pullRequest: true
issue: true

# *OPTIONAL* Add a list of people whose Issues/PRs will not be commented on
# keys must be GitHub usernames
requestInfoUserstoExclude:
- hiimbex
- bexo
38 changes: 38 additions & 0 deletions .github/lock.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Configuration for Lock Threads - https://github.com/dessant/lock-threads-app

# Number of days of inactivity before a closed issue or pull request is locked
daysUntilLock: 20

# Skip issues and pull requests created before a given timestamp. Timestamp must
# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
skipCreatedBefore: false

# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
exemptLabels: []

# Label to add before locking, such as `outdated`. Set to `false` to disable
lockLabel: false

# Comment to post before locking. Set to `false` to disable
lockComment: >
This thread has been automatically locked since there has not been
any recent activity after it was closed. Please open a new issue for
related bugs.
# Assign `resolved` as the reason for locking. Set to `false` to disable
setLockReason: false

# Limit to only `issues` or `pulls`
only: issues

# Optionally, specify configuration settings just for `issues` or `pulls`
# issues:
# exemptLabels:
# - help-wanted
# lockLabel: outdated

# pulls:
# daysUntilLock: 30

# Repository to extend settings from
# _extends: repo
43 changes: 38 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,40 @@ permalink: /docs/en-US/changelog/

# Changelog

## 3.3.0 ( WIP )
## 3.4.1 ( 2020 June 4th )

### Enhancements

* Improved the log folder names from `20200225-182126` to `2020.02.25-18-21-26` ( #2078 )
* Added a `switch_php_debugmod` to replace the `xdebug_on` `tideways_off` style scripts ( #2084 )
* Checks the default password for MySQL root user during provision ( #2077, #2085 )
* Remove NVM support entirely ( #2088 )
* Improved the provider examples in `default-config.yml` ( #2091 )
* Run rubocop on Vagrantfile in a move towards more idiomatic ruby ( #2093 )
* Improved network checks to test more domains ( #2099 )
* ack-grep is now installed via `apt` rather than `beyondgrep.com` ( #2100 )
* Refactor site provisioners ( #2102 )
* Added new bears to the various vagrant trigger scripts ( #2105, #2108 )
* Removed Ubuntu news MOTD ( #2105 )
* Improve network checks wording ( #2106 )
* Support for vagrant-hostmanager ( #2112 )
* Bumped MariaDB sources from 10.3 to 10.4 ( #2140 )
* Improve compatibility with globally installed gems on the guest ( #2138 )
* Add LFTP tool ( #2137 )
* List relevant log files when provisioners fail ( #2161 )

### Bug Fixes

* Fix check for utility installed that prevented SSL certificates to be generated ( #2073 )
* Fix SSL issue on the base Ubuntu image ( #2074 )
* Don't spider and recurse domains when checking for network connections ( #2103 )
* Always set the database root user password to avoid having the default invalid password on fresh installs ( #2104 )
* Swap the MariaDB apt mirror used for a more reliable source ( partially #2140 and in a217369 )
* Fixed an issue with the dpkg lock file not being cleaned up sometimes ( #2151 )
* Fix issues with the sad bear showing at the end of provisioning despite provisioners being succesful ( #2161 )
* Fix provisioners printing all output to console (not just errors) ( #2174 )

## 3.3.0 ( 2020 Feb 26th )

### Enhancements

Expand All @@ -18,7 +51,7 @@ permalink: /docs/en-US/changelog/
* Fixes an issue with the ntpsec package by removing it
* Fixed the use of dots in site names breaking provisioning

## 3.2.0 ( 2019 )
## 3.2.0 ( 2019 Nov 5th )

### Enhancements

Expand Down Expand Up @@ -68,7 +101,7 @@ This is primarily a reliability update. Note that updating to v3.1 requires a `v

### Enhancements

* The vagrant box can now be overriden using the `box` parameter in `vvv-custom.yml` under the `vm_config` section. This requires a `vagrant destroy` followed by a `vagrant up --provision` to recreate the VM using the new box
* The vagrant box can now be overridden using the `box` parameter in `vvv-custom.yml` under the `vm_config` section. This requires a `vagrant destroy` followed by a `vagrant up --provision` to recreate the VM using the new box
* The main provisioner now only fetches the apt keys once rather than on every key check
* The TTY fix shell provisioner and the `/vagrant` setup shell provisioner were merged for a minor reduction in provisioning time.
* Allow `db_backup` script to be run manually regardless if automatic DB backups are disabled
Expand Down Expand Up @@ -138,7 +171,7 @@ In the near future, we expect to use a box with PHP/etc preinstalled, this will
* Auto download plugin for vagrant, supported vagrant 2.2.0+
* Autoset the locale inside the virtual machine to avoid errors in the console
* Added a `vagrant_provision` and `vagrant_provision_custom` script to the homebin folder that run post-provision
* Improved the messaging to tell the user at the end of a `vagrant up` or `vagrant provision` that it was succesful
* Improved the messaging to tell the user at the end of a `vagrant up` or `vagrant provision` that it was successful
* Added friendly splashes at the end of vagrant up and provision to make it obvious to end users when they've finished
* The VVV install path is now in the splash screen, making it easier to debug GH issues
* Added a `wordcamp_contributor_day_box` flag to the `vm_config` section of `vvv-config.yml` so that contributor day setup scripts are simpler
Expand Down Expand Up @@ -227,7 +260,7 @@ Note that to update to 2.2.1, you must remove the Vagrant triggers plugin and in
* PHP 7.2 is now the default PHP version
* Added the TLS CA authority, making HTTPS TLS/SSL connections to VVV sites easier, see [our docs on how to set this up](https://varyingvagrantvagrants.org/docs/en-US/references/https/)
* The VVV terminal splash is now smaller, with better support for lighter colour schemes.
* The dashboard is now a separate git repo cloned on provision, that can be overriden in `vvv-custom.yml`
* The dashboard is now a separate git repo cloned on provision, that can be overridden in `vvv-custom.yml`
* PHPCompatibility PHPCS standards are now installed
* VVV now has a `version` file
* Private network IP can now be changed via `vvv-custom.yml`, see [#1407](https://github.com/Varying-Vagrant-Vagrants/VVV/pull/1407)
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# VVV ( Varying Vagrant Vagrants )

[![Codacy Badge](https://api.codacy.com/project/badge/Grade/206b06167aaf48aab24422cd417e8afa)](https://www.codacy.com/gh/Varying-Vagrant-Vagrants/VVV?utm_source=github.com&utm_medium=referral&utm_content=Varying-Vagrant-Vagrants/VVV&utm_campaign=Badge_Grade)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/206b06167aaf48aab24422cd417e8afa)](https://www.codacy.com/gh/Varying-Vagrant-Vagrants/VVV?utm_source=github.com&utm_medium=referral&utm_content=Varying-Vagrant-Vagrants/VVV&utm_campaign=Badge_Grade) [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/varying-vagrant-vagrants/vvv.svg)](http://isitmaintained.com/project/varying-vagrant-vagrants/vvv "Average time to resolve an issue") [![Percentage of issues still open](http://isitmaintained.com/badge/open/varying-vagrant-vagrants/vvv.svg)](http://isitmaintained.com/project/varying-vagrant-vagrants/vvv "Percentage of issues still open")

VVV is a local developer environment, mainly aimed at [WordPress](https://wordpress.org) developers. It uses [Vagrant](https://www.vagrantup.com) and VirtualBox, and can be used to build sites, and contribute to WordPress.

Expand All @@ -22,8 +22,8 @@ The online documentation contains more detailed [installation instructions](http

## Minimum System requirements

* [Vagrant](https://www.vagrantup.com) 2.2.6 or below.
* [Virtualbox](https://www.virtualbox.org) 6.0.x or below.
* [Vagrant](https://www.vagrantup.com) 2.2.7 or below.
* [Virtualbox](https://www.virtualbox.org) 6.1.x or below.
* 8GB+ of RAM
* Virtualisation ( VT-X ) enabled in the BIOS ( Windows/Linux )
* Hyper-V turned off ( Windows )
Expand Down
Loading

0 comments on commit 4317d11

Please sign in to comment.