Merge pull request #2677 from Varying-Vagrant-Vagrants/github-workflo…

…w-os-version

Use ubuntu 20 for workflows

.github/workflows/vvv-provisioning.yml

@@ -1,21 +1,22 @@
-# This is a basic workflow to help you get started with Actions
-
 name: VVV Provisioning
 
 # Controls when the action will run. Triggers the workflow on push or pull request
 # events but only for the develop branch
 on:
   push:
-    branches: [ develop ]
+    branches:
+      - develop
   pull_request:
-    branches: [ develop, stable ]
+    branches:
+      - develop
+      - stable
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   on-docker:
-    name: Docker Provisioner
+    name: Ubuntu 20 Docker Provisioner
     # The type of runner that the job will run on
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -111,7 +112,7 @@ jobs:
 
   # This workflow contains a single job called "build"
   on-stable:
-    name: Stable Reprovision
+    name: MacOS 10.15 Stable Reprovision
     # The type of runner that the job will run on
     runs-on: macos-10.15
 
@@ -122,6 +123,14 @@ jobs:
         with:
           ref: stable
 
+      - name: Cache Vagrant boxes
+        uses: actions/cache@v2
+        with:
+          path: ~/.vagrant.d/boxes
+          key: ${{ runner.os }}-vagrant-${{ hashFiles('Vagrantfile') }}
+          restore-keys: |
+            ${{ runner.os }}-vagrant-
+
       - name: install goodhosts
         run: vagrant plugin install --local
 
@@ -145,7 +154,7 @@ jobs:
           path: "${{ github.workspace }}/log"
 
   on-develop:
-    name: Develop Reprovision
+    name: MacOS 10.15 Develop Reprovision
     # The type of runner that the job will run on
     runs-on: macos-10.15
 
@@ -156,6 +165,15 @@ jobs:
         with:
           ref: develop
 
+      - name: Cache Vagrant boxes
+        uses: actions/cache@v2
+        with:
+          path: ~/.vagrant.d/boxes
+          key: ${{ runner.os }}-vagrant-${{ hashFiles('Vagrantfile') }}
+          restore-keys: |
+            ${{ runner.os }}-vagrant-
+
+
       - name: install goodhosts
         run: vagrant plugin install --local
 
@@ -179,7 +197,7 @@ jobs:
           path: "${{ github.workspace }}/log"
 
   on-clean:
-    name: Clean Provision
+    name: MacOS 10.15 Clean Provision
     # The type of runner that the job will run on
     runs-on: macos-10.15
 
@@ -188,6 +206,14 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
 
+      - name: Cache Vagrant boxes
+        uses: actions/cache@v2
+        with:
+          path: ~/.vagrant.d/boxes
+          key: ${{ runner.os }}-vagrant-${{ hashFiles('Vagrantfile') }}
+          restore-keys: |
+            ${{ runner.os }}-vagrant-
+
       - name: install goodhosts
         run: vagrant plugin install --local
 

CHANGELOG.md

@@ -19,6 +19,7 @@ permalink: /docs/en-US/changelog/
 ### Bug Fixes
 
 * Fixed a vagrantfile error on Arm when the vagrant-parallels plugin is missing ( #2670 )
+* Github action fixes for composer and an upgrade to Ubuntu 20 ( #2677 )
 
 ## 3.11.2 ( 2023 May 8th )
 

provision/core/composer/provision.sh

@@ -37,7 +37,7 @@ function composer_setup() {
       return 1
     fi
   else
-    vvv_info " * [Composer]: Already installed"
+    vvv_info " * [Composer]: Already installed: $(composer --version)"
   fi
 
   vvv_info " * [Composer]: Making sure the Composer cache is not owned by root"
@@ -47,6 +47,11 @@ function composer_setup() {
   chown -R vagrant:www-data "${COMPOSER_DATA_DIR}"
   chown -R vagrant:www-data /root/.local/share/composer
 
+  # Github runner fixes
+  if [ -d "/home/runner/.config/composer/" ]; then
+    chown -R vagrant:www-data /home/runner/.config/composer/
+  fi
+
   vvv_info " * [Composer]: Checking for GitHub tokens"
   if github_token=$(shyaml get-value -q "general.github_token" < "${VVV_CONFIG}"); then
     vvv_info " * [Composer]: A personal GitHub token was found, configuring Composer"

provision/core/phpcs/provision.sh

@@ -6,6 +6,7 @@ set -eo pipefail
 function php_codesniff_setup() {
   export COMPOSER_ALLOW_SUPERUSER=1
   export COMPOSER_NO_INTERACTION=1
+  export COMPOSER_RUNTIME_ENV="vagrant"
 
   if [[ -f "/srv/www/phpcs/CodeSniffer.conf" ]]; then
     vvv_info " * [PHPCS]: Removing the old PHPCS setup"