From fa1657af87b56d0b4df2303880b1d36fdf83fb7d Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Tue, 27 Jul 2021 14:08:51 +0100 Subject: [PATCH 01/12] fix an error in dashboard provisioning --- provision/provision-dashboard.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From f06bed6cffbed7eec87c6000a11d9bfdfb093f2d Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Tue, 27 Jul 2021 14:10:50 +0100 Subject: [PATCH 02/12] Update CHANGELOG.md --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e0accb2a6..d9f1cbdd6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,8 +6,15 @@ permalink: /docs/en-US/changelog/ # Changelog +## 3.7.2 ( 2021 ) + + ## 3.7.1 ( 2021 July 20th ) +### Bug Fixes + +* Fixed dashboard updating + ### Enhancements * Improved site provisioning messages From c613b36f38be0471edde37a87e81485e7b85e8be Mon Sep 17 00:00:00 2001 From: Brad Parbs Date: Wed, 28 Jul 2021 17:56:10 -0500 Subject: [PATCH 03/12] Time to make the long provisioning warning be a bear. --- Vagrantfile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 81e2c0852..db80d661e 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -694,7 +694,19 @@ Vagrant.configure('2') do |config| 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\"" + # \033[38;5;4m + # \033[38;5;4m \033[01;32mA full provision will take a bit. + # \033[38;5;4m ▄▀▀▀▄▄▄▄▄▄▄▀▀▀▄ ▄ ▄ \033[01;32mSit back, relax, and have some tea. + # \033[38;5;4m █▒▒░░░░░░░░░▒▒█ █ █ + # \033[38;5;4m █░░█░░░░░█░░█ ▀ ▀ \033[01;32mIf you keep seeing this message, + # \033[38;5;4m ▄▄ █░░░▀█▀░░░█ ▄▄ ▄▀▀█▀▀▀▀▀▀█ \033[01;32mmake sure you're running 'vagrant up' + # \033[38;5;4m █░░█ ▀▄░░░░░░░▄▀ █░░█ █ █ █ + # \033[38;5;4m─────────────────────── ▀▀█ █ ─────────────── + # \033[38;5;4m ▀▄▄▄▄▀ + # \033[0m + + # 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 \"\033[38;5;4m\n\033[38;5;4m \033[01;32mA full provision will take a bit.\n\033[38;5;4m ▄▀▀▀▄▄▄▄▄▄▄▀▀▀▄ ▄ ▄ \033[01;32mSit back, relax, and have some tea.\n\033[38;5;4m █▒▒░░░░░░░░░▒▒█ █ █\n\033[38;5;4m █░░█░░░░░█░░█ ▀ ▀ \033[01;32mIf you keep seeing this message,\n\033[38;5;4m ▄▄ █░░░▀█▀░░░█ ▄▄ ▄▀▀█▀▀▀▀▀▀█ \033[01;32mmake sure you're running \'vagrant up\'\n\033[38;5;4m █░░█ ▀▄░░░░░░░▄▀ █░░█ █ █ █\n\033[38;5;4m─────────────────────── ▀▀█ █ ───────────────\n\033[38;5;4m ▀▄▄▄▄▀\n\033[0m\"" # 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 From b1917ad38424d55f2fc100774a1811b7b8690de8 Mon Sep 17 00:00:00 2001 From: Brad Parbs Date: Thu, 29 Jul 2021 14:55:57 -0500 Subject: [PATCH 04/12] Update provisioning bear to be smaller, remove color on text --- Vagrantfile | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index db80d661e..2ad82e14a 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -694,19 +694,16 @@ Vagrant.configure('2') do |config| end end - # \033[38;5;4m - # \033[38;5;4m \033[01;32mA full provision will take a bit. - # \033[38;5;4m ▄▀▀▀▄▄▄▄▄▄▄▀▀▀▄ ▄ ▄ \033[01;32mSit back, relax, and have some tea. - # \033[38;5;4m █▒▒░░░░░░░░░▒▒█ █ █ - # \033[38;5;4m █░░█░░░░░█░░█ ▀ ▀ \033[01;32mIf you keep seeing this message, - # \033[38;5;4m ▄▄ █░░░▀█▀░░░█ ▄▄ ▄▀▀█▀▀▀▀▀▀█ \033[01;32mmake sure you're running 'vagrant up' - # \033[38;5;4m █░░█ ▀▄░░░░░░░▄▀ █░░█ █ █ █ - # \033[38;5;4m─────────────────────── ▀▀█ █ ─────────────── - # \033[38;5;4m ▀▄▄▄▄▀ - # \033[0m +# \033[38;5;4m +# \033[38;5;4m ▄▀▀▀▄▄▄▄▄▄▄▀▀▀▄ ▄ ▄ \033[0mA full provision will take a bit. +# \033[38;5;4m █▒▒░░░░░░░░░▒▒█ █ █ \033[0mSit back, relax, and have some tea. +# \033[38;5;4m █░░█░░░░░█░░█ ▀ ▀ +# \033[38;5;4m ▄▄ █░░░▀█▀░░░█ ▄▀▀█▀▀▀▀▀▀█ \033[0mIf you keep seeing this message, +# \033[38;5;4m █░░█ ▀▄░░░░░░░▄▀ █ █ █ \033[0mmake sure you're running 'vagrant up'. +# \033[38;5;4m───────────────────────────────\033[0m # 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 \"\033[38;5;4m\n\033[38;5;4m \033[01;32mA full provision will take a bit.\n\033[38;5;4m ▄▀▀▀▄▄▄▄▄▄▄▀▀▀▄ ▄ ▄ \033[01;32mSit back, relax, and have some tea.\n\033[38;5;4m █▒▒░░░░░░░░░▒▒█ █ █\n\033[38;5;4m █░░█░░░░░█░░█ ▀ ▀ \033[01;32mIf you keep seeing this message,\n\033[38;5;4m ▄▄ █░░░▀█▀░░░█ ▄▄ ▄▀▀█▀▀▀▀▀▀█ \033[01;32mmake sure you're running \'vagrant up\'\n\033[38;5;4m █░░█ ▀▄░░░░░░░▄▀ █░░█ █ █ █\n\033[38;5;4m─────────────────────── ▀▀█ █ ───────────────\n\033[38;5;4m ▀▄▄▄▄▀\n\033[0m\"" + config.vm.provision "pre-provision-script", type: 'shell', keep_color: true, inline: "echo \"\n\033[38;5;4m ▄▀▀▀▄▄▄▄▄▄▄▀▀▀▄ ▄ ▄ \033[0mA full provision will take a bit.\n\033[38;5;4m █▒▒░░░░░░░░░▒▒█ █ █ \033[0mSit back, relax, and have some tea.\n\033[38;5;4m █░░█░░░░░█░░█ ▀ ▀\n\033[38;5;4m ▄▄ █░░░▀█▀░░░█ ▄▀▀█▀▀▀▀▀▀█ \033[0mIf you keep seeing this message,\n\033[38;5;4m █░░█ ▀▄░░░░░░░▄▀ █ █ █ \033[0mmake sure you're running 'vagrant up'.\n\033[38;5;4m───────────────────────────────\033[0m\n\"" # 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 From 194021c489bf03f5d0b461adcb578fa9daed3a38 Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Fri, 30 Jul 2021 11:01:52 +0100 Subject: [PATCH 05/12] use a heredoc and variables for the provisioning teddy bear --- Vagrantfile | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 2ad82e14a..f8e2888c7 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -693,17 +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 - -# \033[38;5;4m -# \033[38;5;4m ▄▀▀▀▄▄▄▄▄▄▄▀▀▀▄ ▄ ▄ \033[0mA full provision will take a bit. -# \033[38;5;4m █▒▒░░░░░░░░░▒▒█ █ █ \033[0mSit back, relax, and have some tea. -# \033[38;5;4m █░░█░░░░░█░░█ ▀ ▀ -# \033[38;5;4m ▄▄ █░░░▀█▀░░░█ ▄▀▀█▀▀▀▀▀▀█ \033[0mIf you keep seeing this message, -# \033[38;5;4m █░░█ ▀▄░░░░░░░▄▀ █ █ █ \033[0mmake sure you're running 'vagrant up'. -# \033[38;5;4m───────────────────────────────\033[0m + + long_provision_bear = <<~HTM + #{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 keep seeing this message,#{creset} + #{blue} █░░█ ▀▄░░░░░░░▄▀ █ █ █ #{green}make sure you're running '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 \"\n\033[38;5;4m ▄▀▀▀▄▄▄▄▄▄▄▀▀▀▄ ▄ ▄ \033[0mA full provision will take a bit.\n\033[38;5;4m █▒▒░░░░░░░░░▒▒█ █ █ \033[0mSit back, relax, and have some tea.\n\033[38;5;4m █░░█░░░░░█░░█ ▀ ▀\n\033[38;5;4m ▄▄ █░░░▀█▀░░░█ ▄▀▀█▀▀▀▀▀▀█ \033[0mIf you keep seeing this message,\n\033[38;5;4m █░░█ ▀▄░░░░░░░▄▀ █ █ █ \033[0mmake sure you're running 'vagrant up'.\n\033[38;5;4m───────────────────────────────\033[0m\n\"" + 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 From 7134a5374153c832e46de195c13955b8c83cf586 Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Fri, 30 Jul 2021 12:26:19 +0100 Subject: [PATCH 06/12] slight handle tweak to coffee cup --- Vagrantfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index f8e2888c7..076d88591 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -696,11 +696,11 @@ Vagrant.configure('2') do |config| long_provision_bear = <<~HTM #{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 keep seeing this message,#{creset} - #{blue} █░░█ ▀▄░░░░░░░▄▀ █ █ █ #{green}make sure you're running 'vagrant up'.#{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 keep seeing this message,#{creset} + #{blue} █░░█ ▀▄░░░░░░░▄▀▄▀▀█ █ #{green}make sure you're running 'vagrant up'.#{creset} #{blue}───────────────────────────────────────────────────────────────────────#{creset} HTML From a05ee29daf217ad6f928654efa517e76a3e76c68 Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Fri, 30 Jul 2021 12:28:20 +0100 Subject: [PATCH 07/12] tweak coffee message --- Vagrantfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 076d88591..90b144fb8 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -699,8 +699,8 @@ Vagrant.configure('2') do |config| #{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 keep seeing this message,#{creset} - #{blue} █░░█ ▀▄░░░░░░░▄▀▄▀▀█ █ #{green}make sure you're running 'vagrant up'.#{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 From 0456a575013d880cc089ef585b7e07d087fd140c Mon Sep 17 00:00:00 2001 From: Brad Parbs Date: Fri, 30 Jul 2021 08:04:14 -0500 Subject: [PATCH 08/12] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9f1cbdd6..6a5d8dc25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ permalink: /docs/en-US/changelog/ ## 3.7.2 ( 2021 ) +* Updated message on full provision to be more clear +* Added mascot to full provision message ## 3.7.1 ( 2021 July 20th ) From 7b31c65633e44f11f1f25739e34197471799c5d8 Mon Sep 17 00:00:00 2001 From: Brad Parbs Date: Fri, 30 Jul 2021 08:38:52 -0500 Subject: [PATCH 09/12] Update CHANGELOG.md Co-authored-by: Matias Saggiorato --- CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a5d8dc25..da0d2c101 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,7 @@ permalink: /docs/en-US/changelog/ ## 3.7.2 ( 2021 ) -* Updated message on full provision to be more clear -* Added mascot to full provision message +* Added a new bear to full provision message, and updated message to be more clear ## 3.7.1 ( 2021 July 20th ) From ccc620eeccafb408faf9be04148c5bd9af043602 Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Sun, 1 Aug 2021 01:55:04 +0100 Subject: [PATCH 10/12] fix heredoc --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 90b144fb8..b1bc259de 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -694,7 +694,7 @@ Vagrant.configure('2') do |config| end end - long_provision_bear = <<~HTM + 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} From 5afc63e67ee70c3a52dcfa0d9e2a06b3219a25c9 Mon Sep 17 00:00:00 2001 From: tomjn Date: Tue, 3 Aug 2021 19:48:34 +0100 Subject: [PATCH 11/12] switch to the ubuntu 20 bento box from the official box --- CHANGELOG.md | 10 ++++++---- Vagrantfile | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index da0d2c101..b0f920b07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,13 +8,14 @@ permalink: /docs/en-US/changelog/ ## 3.7.2 ( 2021 ) -* Added a new bear to full provision message, and updated message to be more clear +### Bug Fixes -## 3.7.1 ( 2021 July 20th ) +* Switched Ubuntu 20 boxes to Bento on VirtualBox to avoid folder mounting issues +### Enhancements -### Bug Fixes +* Added a new bear to full provision message, and updated message to be more clear -* Fixed dashboard updating +## 3.7.1 ( 2021 July 20th ) ### Enhancements @@ -57,6 +58,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 b1bc259de..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 From 703c348529d4f314dc2b1854ef7df3925cb3f12e Mon Sep 17 00:00:00 2001 From: tomjn Date: Tue, 3 Aug 2021 22:18:24 +0100 Subject: [PATCH 12/12] 3.7.2 --- CHANGELOG.md | 3 ++- version | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b0f920b07..8b5eb5392 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,11 +6,12 @@ permalink: /docs/en-US/changelog/ # Changelog -## 3.7.2 ( 2021 ) +## 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 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