Merge branch '2'

bringyourownideas · Apr 19, 2022 · 25b4994 · 25b4994
2 parents b5f484a + 9f34efe
commit 25b4994
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -6,4 +6,4 @@ on:
 
 jobs:
   ci:
-    uses: silverstripe/github-actions-ci-cd/.github/workflows/[email protected].9
+    uses: silverstripe/github-actions-ci-cd/.github/workflows/[email protected].14
diff --git a/composer.json b/composer.json
@@ -32,8 +32,8 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": "^7.3 || ^8.0",
-        "composer/composer": "^1",
+        "php": "^7.4 || ^8.0",
+        "composer/composer": "^1.10",
         "silverstripe/framework": "^4.10",
         "bringyourownideas/silverstripe-maintenance": "^2"
     },
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,4 +6,4 @@ on: @@
     jobs:
       ci:
-        uses: silverstripe/github-actions-ci-cd/.github/workflows/[email protected].9
+        uses: silverstripe/github-actions-ci-cd/.github/workflows/[email protected].14