Merge branch 'Varying-Vagrant-Vagrants:develop' into develop

Author: jasalt

.github/workflows/vvv-provisioning.yml

@@ -109,122 +109,3 @@ jobs:
         with:
           name: logs-on-docker
           path: "${{ github.workspace }}/log"
-
-  # This workflow contains a single job called "build"
-  on-stable:
-    name: MacOS 10.15 Stable Reprovision
-    # The type of runner that the job will run on
-    runs-on: macos-10.15
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v4
-        with:
-          ref: stable
-
-      - name: Cache Vagrant boxes
-        uses: actions/cache@v3
-        with:
-          path: ~/.vagrant.d/boxes
-          key: ${{ runner.os }}-vagrant-${{ hashFiles('Vagrantfile') }}
-          restore-keys: |
-            ${{ runner.os }}-vagrant-
-
-      - name: install goodhosts
-        run: vagrant plugin install --local
-
-      - name: vagrant up (stable)
-        run: vagrant up
-
-      - uses: actions/checkout@v4
-        with:
-          clean: false
-
-      - name: vagrant up (current branch)
-        run: vagrant up --provision
-
-      - name: tests
-        run: provision/tests/macos-tests.sh
-
-      - uses: actions/upload-artifact@v3
-        if: ${{ always() }}
-        with:
-          name: logs-on-stable
-          path: "${{ github.workspace }}/log"
-
-  on-develop:
-    name: MacOS 10.15 Develop Reprovision
-    # The type of runner that the job will run on
-    runs-on: macos-10.15
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v4
-        with:
-          ref: develop
-
-      - name: Cache Vagrant boxes
-        uses: actions/cache@v3
-        with:
-          path: ~/.vagrant.d/boxes
-          key: ${{ runner.os }}-vagrant-${{ hashFiles('Vagrantfile') }}
-          restore-keys: |
-            ${{ runner.os }}-vagrant-
-
-
-      - name: install goodhosts
-        run: vagrant plugin install --local
-
-      - name: vagrant up (develop)
-        run: vagrant up
-
-      - uses: actions/checkout@v4
-        with:
-          clean: false
-
-      - name: vagrant up (current branch)
-        run: vagrant up --provision
-
-      - name: tests
-        run: provision/tests/macos-tests.sh
-
-      - uses: actions/upload-artifact@v3
-        if: ${{ always() }}
-        with:
-          name: logs-on-develop
-          path: "${{ github.workspace }}/log"
-
-  on-clean:
-    name: MacOS 10.15 Clean Provision
-    # The type of runner that the job will run on
-    runs-on: macos-10.15
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v4
-
-      - name: Cache Vagrant boxes
-        uses: actions/cache@v3
-        with:
-          path: ~/.vagrant.d/boxes
-          key: ${{ runner.os }}-vagrant-${{ hashFiles('Vagrantfile') }}
-          restore-keys: |
-            ${{ runner.os }}-vagrant-
-
-      - name: install goodhosts
-        run: vagrant plugin install --local
-
-      - name: vagrant up (current branch)
-        run: vagrant up
-
-      - name: tests
-        run: provision/tests/macos-tests.sh
-
-      - uses: actions/upload-artifact@v3
-        if: ${{ always() }}
-        with:
-          name: logs-on-clean
-          path: "${{ github.workspace }}/log"

CHANGELOG.md

@@ -6,20 +6,28 @@ permalink: /docs/en-US/changelog/
 
 # Changelog
 
-## 3.13 ( 2023 December TBA )
+## 3.13 ( 2024 TBA )
 
 ### Enhancements
 
-* Switched the default PHP from v7.4 to v8.2 and default Node from v14 to v16 ( #2690 )
+* Switched the default PHP from v7.4 to v8.2 and ~default Node from v14 to v16~ ( #2690 )
+* Use Node 20 as the default version to match WP and Gutenberg ( #2696 )
 * WP Coding standards v3 ( #2688 )
 * VIP Coding standards v3 ( #2688 )
 * Better error messages with links to docs when trying to use a PHP version that isn't installed ( #2689 )
 * Opted out of Dotnet package telemetry ( #2689 )
 * Replace references to the Squizlab PHPCS with that from the PHPCS Standards org ( #2692 )
+* Better PHP Debug mod switching outputs and checks ( #2702 )
+* PHP Info and Xdebug info pages now state their versions ( #2702 )
+
+### Maintenance
+
+* Switch the Parallels Arm64 box from `mpasternak/focal64-arm` to `bento/ubuntu-22.04-arm64` to match x86 boxes ( #2695 )
 
 ### Bug Fixes
 
 * The host file inside the VM was only adding sites with `127.0.0.1` addresses, now it adds the IPVv6 `::1` too ( #2689 )
+* Removed old MacOS PR workflows, no runners available ( #2698 )
 
 ## 3.12 ( 2023 August 3rd )
 

Vagrantfile

@@ -447,7 +447,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     # this seems to be the most reliable way to detect whether or not we're
     # running under ARM64.
     if Etc.uname[:version].include? 'ARM64'
-      override.vm.box = 'mpasternak/focal64-arm'
+      override.vm.box = 'bento/ubuntu-20.04-arm64'
     end
   end
 

config/homebin/switch_php_debugmod

@@ -28,9 +28,21 @@ disable_phpmods() {
 		for phpv in $(phpquery -V)
 		do
 			if is_module_enabled_fpm "${phpv}" "${i}"; then
-				vvv_info " ✘ Disabling active PHP <b>v${phpv}</b><info> debug mod: </info><b>'${i}'</b>"
-				sudo phpdismod -q -s fpm -v "${phpv}" "${i}"
-        sudo phpdismod -q -s cli -v "${phpv}" "${i}"
+				#vvv_info " ✘ Disabling active PHP <b>v${phpv}</b><info> debug mod: </info><b>'${i}'</b>"
+				#sudo phpdismod -q -s fpm -v "${phpv}" "${i}"
+        #sudo phpdismod -q -s cli -v "${phpv}" "${i}"
+
+        if sudo phpdismod -q -v "${phpv}" -s fpm "${i}"; then
+          vvv_success " - ✔ Disabled ${i} for PHP <b>v${phpv} FPM</b>"
+        else
+          vvv_error " - x Could not disable ${i} for PHP <b>v${phpv} FPM</b>"
+        fi
+
+        if sudo phpdismod -q -v "${phpv}" -s cli "${i}"; then
+          vvv_success " - ✔ Disabled ${i} for PHP <b>v${phpv} CLI</b>"
+        else
+          vvv_error " - x Could not disable ${i} for PHP <b>v${phpv} CLI</b>"
+        fi
 			fi
 		done
 	done
@@ -40,11 +52,19 @@ enable_phpmod() {
 	for phpv in $(phpquery -V)
 	do
 		if is_module_installed_fpm "${phpv}" "${1}"; then
-			vvv_info " * Enabling <b>'${1}'</b><info> for PHP <b>v${phpv}</b>"
-			sudo phpenmod -q -v "${phpv}" -s fpm "${1}"
-			sudo phpenmod -q -v "${phpv}" -s cli "${1}"
+			if sudo phpenmod -q -v "${phpv}" -s fpm "${1}"; then
+        vvv_success " - ✔ Enabled ${1} for PHP <b>v${phpv} FPM</b>"
+      else
+        vvv_error " - x Could not enable ${1} for PHP <b>v${phpv} FPM</b>"
+      fi
+
+      if sudo phpenmod -q -v "${phpv}" -s cli "${1}"; then
+        vvv_success " - ✔ Enabled ${1} for PHP <b>v${phpv} CLI</b>"
+      else
+        vvv_error " - x Could not enable ${1} for PHP <b>v${phpv} CLI</b>"
+      fi
 		else
-			vvv_info " * Skipped enabling ${1} in PHP <b>v${phpv}</b><info>, module isn't installed for this version"
+			vvv_info " - ? Skipped enabling ${1} in PHP <b>v${phpv}</b><info>, module isn't installed for this version"
 		fi
 	done
 }
@@ -65,9 +85,19 @@ is_module_installed_fpm() {
 
 restart_phpfpm() {
 	vvv_info " * Restarting PHP FPM services so that the change takes effect"
-	find /etc/init.d/ -name "php*-fpm" -exec bash -c 'sudo service "$(basename "$0")" restart' {} \;
+	if find /etc/init.d/ -name "php*-fpm" -exec bash -c 'sudo service "$(basename "$0")" restart' {} \;; then
+    vvv_success " ✔ Completed restart sequence"
+  else
+    vvv_error " x One of the PHP services failed to restart, changes may not take effect."
+  fi
 }
 
+
+vvv_info "Attempting to disable PHP debug mods and switch to <b>${mod}</b><info>:"
+if [[ "${mod}" == "pcov" ]]; then
+	vvv_info " * pcov supports PHP 7.1 and above, it is not available for 5.6 and 7.0"
+fi
+
 disable_phpmods phpmods[@]
 
 if [[ "${mod}" == "none" ]]; then
@@ -76,10 +106,6 @@ if [[ "${mod}" == "none" ]]; then
 	exit 0
 fi
 
-if [[ "${mod}" == "pcov" ]]; then
-	vvv_info " * pcov supports PHP 7.1 and above, it is not available for 5.6 and 7.0"
-fi
-
 # Tideways needs 2 mods enabling
 if [[ "${mod}" == "tideways" ]]; then
 	enable_phpmod "xhgui"
@@ -91,11 +117,11 @@ fi
 
 if [[ "${mod}" == "xdebug" ]]; then
 	# Ensure the log file for xdebug is group writeable.
-	vvv_info " * Making sure log/php/xdebug-remote.log is readable and present"
+	vvv_info " * Making sure <b>log/php/xdebug-remote.log</b><info> is readable and present"
 	sudo touch /var/log/php/xdebug-remote.log
 	sudo chmod 664 /var/log/php/xdebug-remote.log
 fi
 
 enable_phpmod "${mod}"
 restart_phpfpm
-vvv_success " ✔ PHP Debug mod switch to <b>${mod}</b><success> on all available PHP versions complete.</success>"
+vvv_info " ✔ PHP Debug mod switch to <b>${mod}</b><success> on all available PHP versions complete.</success>"

provision/core/node-nvm/provision.sh

@@ -53,9 +53,9 @@ function vvv_nvm_setup() {
 
   fi
 
-  vvv_info " - Installing Node 16 via nvm"
-  nvm install 16
-  nvm use 16
+  vvv_info " - Installing Node 20 via nvm"
+  nvm install 20
+  nvm use 20
 
   vvv_info " - Ensuring vagrant user owns its own nvm folder"
   chown -R vagrant:vagrant /home/vagrant/.nvm/

www/default/phpinfo/index.php

@@ -4,10 +4,10 @@
  */
 ?>
 <nav class="center">
-	<a href="//vvv.test/phpinfo/">PHP Info</a>
+	<a href="//vvv.test/phpinfo/">PHP Info (v<?php echo phpversion(); ?>)</a>
 	<?php
 	if ( function_exists( 'xdebug_info' ) ) {
-		?>&middot; <a href="//vvv.test/xdebuginfo/">Xdebug Info</a><?php
+		?>&middot; <a href="//vvv.test/xdebuginfo/">Xdebug Info (v<?php echo phpversion('xdebug'); ?>)</a><?php
 	}
 	?>
 </nav>

www/default/xdebuginfo/index.php

@@ -5,7 +5,6 @@
 ?>
 <style type="text/css">
 body {
-    color: #222;
     font-family: sans-serif;
 }
 
@@ -25,10 +24,10 @@
 }
 </style>
 <nav class="center">
-	<a href="//vvv.test/phpinfo/">PHP Info</a>
+	<a href="//vvv.test/phpinfo/">PHP Info (v<?php echo phpversion(); ?>)</a>
 	<?php
 	if ( function_exists( 'xdebug_info' ) ) {
-		?>&middot; <a href="//vvv.test/xdebuginfo/">Xdebug Info</a><?php
+		?>&middot; <a href="//vvv.test/xdebuginfo/">Xdebug Info (v<?php echo phpversion('xdebug'); ?>)</a><?php
 	}
 	?>
 </nav>