Optimize composer installs (#41)

Co-authored-by: david_smith <david_smith@sweetwater.com>

.github/workflows/test.yml

@@ -27,12 +27,18 @@ jobs:
       - name: Cache Composer dependencies
         uses: actions/cache@v4
         with:
-          path: vendor
+          path: ./vendor-${{ matrix.php-version }}
           key: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-php-${{ matrix.php-version }}-
 
-      - name: Install dependencies
-        run: docker compose run --rm -v ${{ github.workspace }}/test-output:/app/test-output ${{ matrix.php-version }}composer composer install --prefer-dist
+      - name: Install dependencies (if needed)
+        run: |
+          if [ ! -d ./vendor-${{ matrix.php-version }} ] || [ -z "$(ls -A ./vendor-${{ matrix.php-version }})" ]; then
+            echo "Dependencies not found or vendor directory is empty. Installing dependencies..."
+            docker compose run --rm -v ${{ github.workspace }}/vendor-${{ matrix.php-version }}:/app/vendor ${{ matrix.php-version }}composer composer install --prefer-dist
+          else
+            echo "Dependencies already installed for ${{ matrix.php-version }}. Skipping composer install."
+          fi
 
       - name: Run tests
-        run: docker compose run --rm -v ${{ github.workspace }}/test-output:/app/test-output ${{ matrix.php-version }} vendor/bin/phpunit
+        run: docker compose run --rm -v ${{ github.workspace }}/vendor-${{ matrix.php-version }}:/app/vendor ${{ matrix.php-version }} vendor/bin/phpunit

.gitignore

@@ -4,3 +4,6 @@ composer.lock
 .phpunit.result.cache
 .php-cs-fixer.cache
 /.phpunit.cache/
+/vendor-php81/
+/vendor-php82/
+/vendor-php83/

docker-compose.yml

@@ -5,6 +5,7 @@ services:
       target: base
     volumes:
       - ./:/app
+      - ./vendor-php81:/app/vendor
 
   php81debug:
     build:
@@ -13,20 +14,23 @@ services:
     volumes:
       - ./:/app
       - ./docker/php81:/usr/local/etc/php
+      - ./vendor-php81:/app/vendor
 
   php81composer:
     build:
       context: docker/php81
       target: composer
     volumes:
       - ./:/app
+      - ./vendor-php81:/app/vendor
 
   php82:
     build:
       context: docker/php82
       target: base
     volumes:
       - ./:/app
+      - ./vendor-php82:/app/vendor
 
   php82debug:
     build:
@@ -35,32 +39,37 @@ services:
     volumes:
       - ./:/app
       - ./docker/php82:/usr/local/etc/php
+      - ./vendor-php82:/app/vendor
 
   php82composer:
     build:
       context: docker/php82
       target: composer
     volumes:
       - ./:/app
+      - ./vendor-php82:/app/vendor
 
   php83:
     build:
       context: docker/php83
       target: base
     volumes:
       - ./:/app
+      - ./vendor-php83:/app/vendor
 
   php83debug:
     build:
       context: docker/php83
       target: debug
     volumes:
       - ./:/app
-      - ./docker/php82:/usr/local/etc/php
+      - ./docker/php83:/usr/local/etc/php
+      - ./vendor-php83:/app/vendor
 
   php83composer:
     build:
       context: docker/php83
       target: composer
     volumes:
-      - ./:/app
+      - ./:/app
+      - ./vendor-php83:/app/vendor

test.sh

@@ -1,21 +1,18 @@
-# run-tests.sh
+#!/bin/bash
 set -e
 
 php_versions=("php83" "php82" "php81")
 
 for version in "${php_versions[@]}"; do
-  if [ -f composer.lock ]; then
-    echo "removing composer.lock"
-    rm composer.lock
-  fi
+  vendor_dir="./vendor-${version}"
 
-  docker compose run --rm "$version"composer composer install
+  if [ ! -d "$vendor_dir" ] || [ -z "$(ls -A "$vendor_dir")" ]; then
+    echo "Dependencies not found or vendor directory is empty for $version. Installing dependencies..."
+    docker compose run --rm "${version}composer" composer install --no-cache
+  fi
 
-  echo "Running tests on $version..."
   if ! docker compose run --rm "$version" vendor/bin/phpunit; then
     echo "Tests failed on $version."
     exit 1
   fi
-done
-
-echo "All tests passed!"
+done