From 8b30e1be0c5df19b88cd9e8cbd6161434b16dcd1 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Mon, 13 Dec 2021 15:53:27 +1300 Subject: [PATCH] DEP Require composer ^1.10, remove branch-alias --- .github/workflows/main.yml | 2 +- composer.json | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c19d6e8..abb0518 100644 --- 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/ci.yml@0.1.9 + uses: silverstripe/github-actions-ci-cd/.github/workflows/ci.yml@0.1.12 diff --git a/composer.json b/composer.json index 44a7eaf..b9fedf8 100644 --- 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" },