From f77ed2b1481067d4d516addcbfdd9e698669a664 Mon Sep 17 00:00:00 2001 From: Nic Wortel Date: Thu, 10 Dec 2020 22:02:59 +0100 Subject: [PATCH 1/2] Test against PHP 8.0 --- .github/workflows/continuous-integration.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index de172320..b8d949f7 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -30,6 +30,7 @@ jobs: - "7.2" - "7.3" - "7.4" + - "8.0" dependencies: - "highest" include: From 88c3346ef18dfed0a42d5c7032c78661c2f92a66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Sat, 23 Jan 2021 11:04:06 +0100 Subject: [PATCH 2/2] Address move away from master --- .doctrine-project.json | 16 +++++++++++----- .github/workflows/coding-standards.yml | 2 -- .github/workflows/continuous-integration.yml | 2 -- composer.json | 5 ----- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.doctrine-project.json b/.doctrine-project.json index 06747ffa..6e8cd3d1 100644 --- a/.doctrine-project.json +++ b/.doctrine-project.json @@ -5,20 +5,26 @@ "docsSlug": "doctrine-data-fixtures", "versions": [ { - "name": "1.4", - "branchName": "master", + "name": "1.5", + "branchName": "1.5.x", "slug": "latest", "upcoming": true }, { - "name": "1.3", - "branchName": "1.3", - "slug": "1.3", + "name": "1.4", + "branchName": "1.4.x", + "slug": "1.4", "current": true, "aliases": [ "current", "stable" ] + }, + { + "name": "1.3", + "branchName": "1.3", + "slug": "1.3", + "maintained": false } ] } diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 6ea20699..513e7ee2 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -4,11 +4,9 @@ on: pull_request: branches: - "*.x" - - "master" push: branches: - "*.x" - - "master" jobs: coding-standards: diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index b8d949f7..e37636b7 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -4,11 +4,9 @@ on: pull_request: branches: - "*.x" - - "master" push: branches: - "*.x" - - "master" env: fail-fast: true diff --git a/composer.json b/composer.json index c9182b77..9ec9b4bb 100644 --- a/composer.json +++ b/composer.json @@ -38,11 +38,6 @@ "config": { "sort-packages": true }, - "extra": { - "branch-alias": { - "dev-master": "1.4.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Common\\DataFixtures\\": "lib/Doctrine/Common/DataFixtures"