diff --git a/CHANGELOG.md b/CHANGELOG.md index e0accb2a6..8b5eb5392 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,16 @@ permalink: /docs/en-US/changelog/ # Changelog +## 3.7.2 ( 2021 August 3rd ) + +### Bug Fixes + +* Switched Ubuntu 20 boxes to Bento on VirtualBox to avoid folder mounting issues +* Fixed a broken heredoc +### Enhancements + +* Added a new bear to full provision message, and updated message to be more clear + ## 3.7.1 ( 2021 July 20th ) ### Enhancements @@ -49,6 +59,7 @@ permalink: /docs/en-US/changelog/ * Skip mounting custom folders for skipped sites * Improved WP CLI ownership and permission settings * Removed WP CLI doctor subcommand package that was causing issues for some users +* Fixed dashboard updating ## 3.6.2 ( 2021 March 17th ) diff --git a/Vagrantfile b/Vagrantfile index 81e2c0852..822494cc6 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -395,10 +395,10 @@ Vagrant.configure('2') do |config| # Default Ubuntu Box # - # This box is provided by Ubuntu vagrantcloud.com and is a nicely sized + # This box is provided by Bento boxes via vagrantcloud.com and is a nicely sized # box containing the Ubuntu 20.04 Focal 64 bit release. Once this box is downloaded # to your host computer, it is cached for future use under the specified box name. - config.vm.box = 'ubuntu/focal64' + config.vm.box = 'bento/ubuntu-20.04' config.vm.box_check_update = false # If we're at a contributor day, switch the base box to the prebuilt one @@ -693,8 +693,19 @@ Vagrant.configure('2') do |config| config.vm.provision "flag-root-vagrant-command", type: 'shell', keep_color: true, inline: "mkdir -p /vagrant && touch /vagrant/provisioned_as_root" end end - - config.vm.provision "pre-provision-script", type: 'shell', keep_color: true, inline: "echo \"\n༼ つ ◕_◕ ༽つ A full provision can take a little while!\n Go make a cup of tea and sit back.\n If you only wanted to turn VVV on, use vagrant up\n\"" + + long_provision_bear = <<~HTML + #{blue}#{creset} + #{blue} ▄▀▀▀▄▄▄▄▄▄▄▀▀▀▄ ▄ ▄ #{green}A full provision will take a bit.#{creset} + #{blue} █▒▒░░░░░░░░░▒▒█ █ █ #{green}Sit back, relax, and have some tea.#{creset} + #{blue} █░░█░░░░░█░░█ ▀ ▀ #{creset} + #{blue} ▄▄ █░░░▀█▀░░░█ █▀▀▀▀▀▀█ #{green}If you didn't want to provision you can#{creset} + #{blue} █░░█ ▀▄░░░░░░░▄▀▄▀▀█ █ #{green}turn VVV on with 'vagrant up'.#{creset} + #{blue}───────────────────────────────────────────────────────────────────────#{creset} + HTML + + # Changed the message here because it's going to show the first time you do vagrant up, which might be confusing + config.vm.provision "pre-provision-script", type: 'shell', keep_color: true, inline: "echo \"#{long_provision_bear}\"" # provison-pre.sh acts as a pre-hook to our default provisioning script. Anything that # should run before the shell commands laid out in provision.sh (or your provision-custom.sh diff --git a/provision/provision-dashboard.sh b/provision/provision-dashboard.sh index f41c8b15d..5af2f239b 100755 --- a/provision/provision-dashboard.sh +++ b/provision/provision-dashboard.sh @@ -21,12 +21,12 @@ if [[ false != "dashboard" && false != "${REPO}" ]]; then fi else vvv_info " * Updating dashboard on the '${BRANCH}' branch." - popd "${DIR}" + pushd "${DIR}" vvv_info " * Fetching origin ${BRANCH}" noroot git fetch origin "${BRANCH}" vvv_info " * performing a hard reset on origin/${BRANCH}" noroot git reset "origin/${BRANCH}" --hard - pushd + popd fi vvv_warn " * Note that custom dashboards will be going away in a future update, use a site provisioner and a custom host instead such as dashboard.test." else diff --git a/version b/version index a76ccff2a..47b6be3fa 100644 --- a/version +++ b/version @@ -1 +1 @@ -3.7.1 +3.7.2 \ No newline at end of file