From 33c26278194fe681d894da57ddb0a7847bdd3942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Fri, 29 Mar 2024 08:51:28 +0100 Subject: [PATCH 1/3] Configure docs path depending on the branch The directory structure differs between both branches. --- .symfony.bundle.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.symfony.bundle.yaml b/.symfony.bundle.yaml index 483351a..84eacbe 100644 --- a/.symfony.bundle.yaml +++ b/.symfony.bundle.yaml @@ -1,4 +1,4 @@ branches: ["3.3.x", "3.4.x", "3.5.x", "3.6.x"] maintained_branches: ["3.5.x", "3.6.x"] -doc_dir: "Resources/doc/" +doc_dir: {"3.5.x": "Resources/doc/", "3.6.x": "docs/"} dev_branch: "3.6.x" From 73d9271680ce7b134c757762e4d24cdd707cd60d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Sat, 30 Mar 2024 08:07:29 +0100 Subject: [PATCH 2/3] Remove changelog (#428) --- CHANGELOG-3.1.md | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 CHANGELOG-3.1.md diff --git a/CHANGELOG-3.1.md b/CHANGELOG-3.1.md deleted file mode 100644 index 7f8d2fc..0000000 --- a/CHANGELOG-3.1.md +++ /dev/null @@ -1,14 +0,0 @@ -CHANGELOG for 3.1.x -=================== - -This changelog references the relevant changes (bug and security fixes) done in -3.1 minor versions. - -3.1.0 (2018-12-21) ------------------- - - - [270: Show the name of the database being purged when loading fixtures](https://github.com/doctrine/DoctrineFixturesBundle/pull/270) thanks to @alcaeus - - [265: Drop support for PHP < 7.1 and older versions of data-fixtures](https://github.com/doctrine/DoctrineFixturesBundle/pull/265) thanks to @alcaeus - - [260: Add fixture groups via a static method interface or service tags](https://github.com/doctrine/DoctrineFixturesBundle/pull/260) thanks to @weaverryan - - [269: Apply Doctrine Coding Standard](https://github.com/doctrine/DoctrineFixturesBundle/pull/269) thanks to @carusogabriel - - [219: Dynamic namespace](https://github.com/doctrine/DoctrineFixturesBundle/issues/219) thanks to @MassiveHiggsField From bbaac82778803a1c9cb1f77c50915abbfccf5214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Tue, 2 Apr 2024 12:12:48 +0200 Subject: [PATCH 3/3] Bump workflow actions --- .github/workflows/coding-standards.yml | 2 +- .github/workflows/release-on-milestone-closed.yml | 2 +- .github/workflows/static-analysis.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 4c3441a..9d0faaf 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -12,4 +12,4 @@ on: jobs: coding-standards: name: "Coding Standards" - uses: "doctrine/.github/.github/workflows/coding-standards.yml@3.1.0" + uses: "doctrine/.github/.github/workflows/coding-standards.yml@4.0.0" diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml index cc6ac55..34abfbc 100644 --- a/.github/workflows/release-on-milestone-closed.yml +++ b/.github/workflows/release-on-milestone-closed.yml @@ -8,7 +8,7 @@ on: jobs: release: name: "Git tag, release & create merge-up PR" - uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@3.1.0" + uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@4.0.0" secrets: GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }} GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }} diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index e8e4dc1..656c03c 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -11,4 +11,4 @@ on: jobs: static-analysis: - uses: "doctrine/.github/.github/workflows/static-analysis.yml@3.1.0" + uses: "doctrine/.github/.github/workflows/static-analysis.yml@4.0.0"