diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml index 43ebbcaa..341f79be 100644 --- a/.github/workflows/copilot-setup-steps.yml +++ b/.github/workflows/copilot-setup-steps.yml @@ -3,7 +3,7 @@ name: "Copilot Setup Steps" on: workflow_dispatch: push: - branches: [ master ] + branches: [ master, '1.x' ] paths: - .github/workflows/copilot-setup-steps.yml pull_request: diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 501f57ca..0181e8d8 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -2,9 +2,9 @@ name: build on: push: - branches: [ master ] + branches: [ master, '1.x' ] pull_request: - branches: [ master ] + branches: [ master, '1.x' ] paths-ignore: - README.md diff --git a/README.md b/README.md index 9054106c..9bdac188 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -

GitHub Workflow Status Codecov Packagist Downloads (custom server) - Docs Packagist License

+

GitHub Workflow Status Codecov Packagist Downloads (custom server) + Docs Packagist License

Durable Workflow (formerly Laravel Workflow) is a package for the Laravel web framework that provides tools for defining and managing workflows and activities. A workflow is a series of interconnected activities that are executed in a specific order to achieve a desired result. Activities are individual tasks or pieces of logic that are executed as part of a workflow. diff --git a/tests/Unit/CiWorkflowPolicyTest.php b/tests/Unit/CiWorkflowPolicyTest.php index 25d89f83..1fd5720f 100644 --- a/tests/Unit/CiWorkflowPolicyTest.php +++ b/tests/Unit/CiWorkflowPolicyTest.php @@ -19,7 +19,7 @@ public function testCopilotSetupUsesTheSupportedBranchAndToolchainContract(): vo self::assertIsString($events); self::assertMatchesRegularExpression( - '/^ workflow_dispatch:\R push:\R branches: \[ master \]\R paths:\R' . + "/^ workflow_dispatch:\\R push:\\R branches: \\[ master, '1\\.x' \\]\\R paths:\\R" . ' - \.github\/workflows\/copilot-setup-steps\.yml$/m', $events ); @@ -119,14 +119,14 @@ public function testReadmeOnlyPullRequestsAreIgnoredWithoutWeakeningPushQualific $events = strstr(self::workflow(), "\njobs:", true); self::assertIsString($events); - self::assertMatchesRegularExpression('/^ push:\R branches: \[ master \]$/m', $events); + self::assertMatchesRegularExpression("/^ push:\\R branches: \\[ master, '1\\.x' \\]$/m", $events); $push = strstr($events, ' pull_request:', true); self::assertIsString($push); self::assertStringNotContainsString('paths-ignore:', $push); self::assertMatchesRegularExpression( - '/^ pull_request:\R branches: \[ master \]\R paths-ignore:\R - README\.md\R\z/m', + "/^ pull_request:\\R branches: \\[ master, '1\\.x' \\]\\R paths-ignore:\\R - README\\.md\\R\\z/m", $events ); }