Merge pull request #55 from creative-commoners/pulls/2.1/composer

DEP Require composer ^1.10, remove branch-alias
bringyourownideas · Dec 13, 2021 · 00a3990 · 00a3990
2 parents 8260e66 + 8b30e1b
commit 00a3990
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 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].12
diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
     "prefer-stable": true,
     "require": {
         "php": "^7.3 || ^8.0",
-        "composer/composer": "^1",
+        "composer/composer": "^1.10",
         "silverstripe/framework": "^4.10",
         "bringyourownideas/silverstripe-maintenance": "^2"
     },
@@ -47,11 +47,6 @@
             "BringYourOwnIdeas\\UpdateChecker\\Tests\\": "tests/"
         }
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.x-dev"
-        }
-    },
     "replace": {
         "spekulatius/silverstripe-composer-update-checker": "self.version"
     },
-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].12