Merge pull request #7 from builtnorth/dev

Dev

Author: dannorthern

.github/workflows/release.yml

@@ -56,13 +56,8 @@ jobs:
           php-version: '8.2'
           tools: composer:v2
 
-      - name: Update composer.json version
-        if: contains(fromJSON('["composer.json", "package.json"]'), 'composer.json')
-        run: |
-          if [ -f composer.json ]; then
-            jq '.version = "${{ steps.version.outputs.version_number }}"' composer.json > composer.tmp.json
-            mv composer.tmp.json composer.json
-          fi
+      # Skip composer.json version update - version tracked via git tags only
+      # This prevents merge conflicts between branches
 
       - name: Update package.json version
         if: contains(fromJSON('["package.json"]'), 'package.json')
@@ -77,9 +72,7 @@ jobs:
           git config --local user.email "action@github.com"
           git config --local user.name "GitHub Action"
           
-          if [ -f composer.json ]; then
-            git add composer.json
-          fi
+          # Skip adding composer.json - version tracked via git tags only
           if [ -f package.json ]; then
             git add package.json package-lock.json
           fi
@@ -124,25 +117,25 @@ jobs:
           OTHER=$(echo "$COMMITS" | grep -vE "^- (feat|feature|fix|bugfix|docs|documentation|style|formatting|refactor|refactoring|test|tests|chore|build|ci):" || true)
           
           if [ -n "$FEATURES" ]; then
-            CHANGELOG="$CHANGELOG"$'\n'"### 🚀 Features"$'\n'"$FEATURES"$'\n'
+            CHANGELOG="$CHANGELOG"$'\n'"### Features"$'\n'"$FEATURES"$'\n'
           fi
           if [ -n "$FIXES" ]; then
-            CHANGELOG="$CHANGELOG"$'\n'"### 🐛 Bug Fixes"$'\n'"$FIXES"$'\n'
+            CHANGELOG="$CHANGELOG"$'\n'"### Bug Fixes"$'\n'"$FIXES"$'\n'
           fi
           if [ -n "$DOCS" ]; then
-            CHANGELOG="$CHANGELOG"$'\n'"### 📚 Documentation"$'\n'"$DOCS"$'\n'
+            CHANGELOG="$CHANGELOG"$'\n'"### Documentation"$'\n'"$DOCS"$'\n'
           fi
           if [ -n "$REFACTOR" ]; then
-            CHANGELOG="$CHANGELOG"$'\n'"### ♻️ Refactoring"$'\n'"$REFACTOR"$'\n'
+            CHANGELOG="$CHANGELOG"$'\n'"### Refactoring"$'\n'"$REFACTOR"$'\n'
           fi
           if [ -n "$TEST" ]; then
-            CHANGELOG="$CHANGELOG"$'\n'"### ✅ Tests"$'\n'"$TEST"$'\n'
+            CHANGELOG="$CHANGELOG"$'\n'"### Tests"$'\n'"$TEST"$'\n'
           fi
           if [ -n "$CHORE" ]; then
-            CHANGELOG="$CHANGELOG"$'\n'"### 🔧 Maintenance"$'\n'"$CHORE"$'\n'
+            CHANGELOG="$CHANGELOG"$'\n'"### Maintenance"$'\n'"$CHORE"$'\n'
           fi
           if [ -n "$OTHER" ]; then
-            CHANGELOG="$CHANGELOG"$'\n'"### 📦 Other Changes"$'\n'"$OTHER"$'\n'
+            CHANGELOG="$CHANGELOG"$'\n'"### Other Changes"$'\n'"$OTHER"$'\n'
           fi
           
           CHANGELOG="$CHANGELOG"$'\n'"**Full Changelog**: "
@@ -196,7 +189,7 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           tag_name: ${{ steps.version.outputs.version }}
-          name: ${{ env.PACKAGE_DISPLAY_NAME }} ${{ steps.version.outputs.version }}
+          name: ${{ steps.version.outputs.version }}
           body_path: release_notes.md
           draft: false
           prerelease: ${{ github.event.inputs.prerelease == 'true' }}
@@ -209,9 +202,9 @@ jobs:
       - name: Release summary
         if: success()
         run: |
-          echo "✅ Release created successfully!"
+          echo "Release created successfully!"
           echo ""
-          echo "📦 To use this version in other packages:"
+          echo "To use this version in other packages:"
           echo ""
           echo "    \"require\": {"
           echo "        \"${{ env.COMPOSER_NAMESPACE }}\": \"${{ steps.version.outputs.version_number }}\""

.github/workflows/tests.yml

@@ -0,0 +1,70 @@
+name: Tests
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+  workflow_dispatch:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    
+    strategy:
+      fail-fast: false
+      matrix:
+        php-version: ['8.1', '8.2', '8.3', '8.4']
+    
+    name: PHP ${{ matrix.php-version }}
+    
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          coverage: none
+          tools: composer:v2
+      
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+      
+      - name: Cache dependencies
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-composer-
+      
+      - name: Validate composer.json
+        run: composer validate --strict --no-check-lock
+      
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-progress --no-interaction
+      
+      - name: Security check for vulnerabilities
+        run: composer audit --no-dev
+      
+      - name: Run tests
+        run: composer test
+
+  test-status:
+    name: CI Status
+    runs-on: ubuntu-latest
+    needs: test
+    if: always()
+    
+    steps:
+      - name: Check results
+        run: |
+          if [ "${{ needs.test.result }}" == "success" ]; then
+            echo "✅ All checks passed!"
+            exit 0
+          else
+            echo "❌ Tests failed!"
+            exit 1
+          fi

.gitignore

@@ -15,6 +15,12 @@ composer.lock
 # Log files
 *.log
 
+#various
+wp-content/uploads/sites/*/gravity_forms
+wp-content/uploads/sites/*/wp-migrate-db
+wp-content/uploads/wpo-plugins-tables-list.json
+
+
 
 # Project Files
 dist