Merge branch 'master' into optional

jpal91 · jpal91 · commit d6125b6fde70 · 2024-06-13T11:43:10.000-04:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,7 +23,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu-latest, windows-latest, macos-latest-large]
+        # Test on macos-13 because the macos-14 runner doesn't come with php installed.
+        platform: [ubuntu-latest, windows-latest, macos-13]
     env:
       CLICOLOR_FORCE: 1
     steps:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 
 ## UNRELEASED
 
+* ci: Fix php tests on macos actions runner [#110](https://github.com/jacobdeichert/mask/pull/110)
 
 ## v0.11.4 (2023-10-15)
 

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`
`4`	`4`	`## UNRELEASED`
`5`	`5`
	`6`	`+* ci: Fix php tests on macos actions runner [#110](https://github.com/jacobdeichert/mask/pull/110)`
`6`	`7`
`7`	`8`	`## v0.11.4 (2023-10-15)`
`8`	`9`