Merge pull request #283 from php-school/actions-on-all-branches

Run actions on all branches/prs
php-school · May 5, 2024 · fb82157 · fb82157
2 parents a0c3359 + ec5dadc
commit fb82157
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/.github/workflows/php-workshop.yml b/.github/workflows/php-workshop.yml
@@ -2,9 +2,7 @@ name: PhpWorkshop
 
 on:
   push:
-    branches: [ master ]
   pull_request:
-    branches: [ master ]
 
 jobs:
   build:

diff --git a/test/Process/DockerProcessFactoryTest.php b/test/Process/DockerProcessFactoryTest.php
@@ -75,7 +75,7 @@ public function testCreateWithArgs(): void
 
         $process = $factory->create($input);
         $cmd  = "'/usr/local/bin/docker' 'compose' '-p' 'php8appreciate' '-f' '.docker/runtime/docker-compose.yml'";
-        $cmd .= "'run' '--rm' '-w' '/solution' 'runtime' 'php' 'one' 'two'";
+        $cmd .= " 'run' '--rm' '-w' '/solution' 'runtime' 'php' 'one' 'two'";
         static::assertSame($cmd, $process->getCommandLine());
         static::assertSame('/docker-dir', $process->getWorkingDirectory());
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,9 +2,7 @@ name: PhpWorkshop @@
     on:
       push:
-        branches: [ master ]
       pull_request:
-        branches: [ master ]
     jobs:
       build:
@@ Expand Down @@