Fix GitHub Actions CI test execution - Fixed SCRIPT_DIR path resolution in test script - Added main/master branch compatibility - Enhanced GitHub Actions workflow with debugging output - Tests now pass both locally and in CI environment

Author: cursoragent

.github/workflows/test.yml

@@ -14,13 +14,24 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v4
 
+    - name: Verify repository structure
+      run: |
+        echo "Current directory: $(pwd)"
+        echo "Repository contents:"
+        ls -la
+        echo "Bin directory contents:"
+        ls -la bin/
+        
     - name: Make test script executable
       run: chmod +x bin/gitstack_test.sh
 
     - name: Run gitstack tests
+      working-directory: .
       run: |
         echo "🧪 Running gitstack tests..."
-        if bin/gitstack_test.sh; then
+        echo "Working directory: $(pwd)"
+        echo "Running from: $(realpath bin/gitstack_test.sh)"
+        if ./bin/gitstack_test.sh; then
           echo "✅ All tests passed!"
         else
           echo "❌ Tests failed!"

bin/gitstack_test.sh

@@ -20,6 +20,9 @@
 
 set -e  # Exit immediately if a command exits with a nonzero status
 
+# Get the absolute path of the script directory BEFORE changing directories
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
 function current_branch() {
   git rev-parse --abbrev-ref HEAD
 }
@@ -32,7 +35,6 @@ function fail() {
 # Test helper function to source gitstack.sh and make functions available for testing
 function source_gitstack() {
   # Source the main script to get access to internal functions
-  SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
   echo "Sourcing from: $SCRIPT_DIR/gitstack.sh"
   source "$SCRIPT_DIR/gitstack.sh"
 }
@@ -450,9 +452,6 @@ function run_all_tests() {
   test_convert_to_stack
 }
 
-# Get the absolute path of the script directory
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
 # Create a temporary test directory
 TEST_DIR=$(mktemp -d)
 echo "Creating test repository in $TEST_DIR"
@@ -468,6 +467,11 @@ touch README.md
 git add README.md
 git commit -m "Initial commit"
 
+# Rename master to main if needed (for consistency)
+if git rev-parse --verify master &>/dev/null && ! git rev-parse --verify main &>/dev/null; then
+  git branch -m master main
+fi
+
 echo "Starting git stack tests..."
 
 # Run all tests