Merge branch 'release/9.x' of github.com:ec-europa/toolkit into relea…

…se/10.x
ec-europa · Mar 3, 2023 · 597d8f4 · 597d8f4
2 parents df4fc67 + aff7c8f
commit 597d8f4
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 17 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -2,6 +2,8 @@ clone:
   git:
     image: registry.fpfis.eu/drone-plugins/git:next
 
+branches: [ feature/*, release/* ]
+
 workspace:
   base: /test
   path: toolkit

diff --git a/.gitattributes b/.gitattributes
@@ -167,16 +167,16 @@ Procfile          text
 *.patch           -text
 
 # Exclude files from exporting
-.drone.yml         export-ignore
-.editorconfig      export-ignore
-.eslintrc.json     export-ignore
-.gitattributes     export-ignore
-.gitignore         export-ignore
-.gitkeep           export-ignore
-.github/           export-ignore
-tests/             export-ignore
-docker-compose.yml export-ignore
-phpcs.xml          export-ignore
-phpdoc.dist.xml    export-ignore
-phpmd.xml          export-ignore
-phpunit.xml.dist   export-ignore
+/.drone.yml         export-ignore
+/.editorconfig      export-ignore
+/.eslintrc.json     export-ignore
+/.gitattributes     export-ignore
+/.gitignore         export-ignore
+/.gitkeep           export-ignore
+/.github/           export-ignore
+/tests/             export-ignore
+/docker-compose.yml export-ignore
+/phpcs.xml          export-ignore
+/phpdoc.dist.xml    export-ignore
+/phpmd.xml          export-ignore
+/phpunit.xml.dist   export-ignore
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Toolkit change log
 
+## Version 9.7.1 | 10.0.0-beta3
+- DQA-0: Prevent gitattributes from ignoring nested files.
+- DQA-0: Apply branch condition in drone.
+
 ## Version 9.6.1 | 10.0.0-beta2
 - DQA-5962: Refactor configurations load.
 

diff --git a/phpdoc.dist.xml b/phpdoc.dist.xml
@@ -9,7 +9,7 @@
     <paths>
         <output>docs</output>
     </paths>
-    <version number="10.0.0-beta2">
+    <version number="10.0.0-beta3">
         <folder>latest</folder>
         <api>
             <source dsn=".">

diff --git a/src/Toolkit.php b/src/Toolkit.php
@@ -14,7 +14,7 @@ final class Toolkit
     /**
      * Constant holding the current version.
      */
-    public const VERSION = '10.0.0-beta2';
+    public const VERSION = '10.0.0-beta3';
 
     /**
      * Returns the Toolkit root.

diff --git a/tests/fixtures/commands/tool.yml b/tests/fixtures/commands/tool.yml
@@ -62,7 +62,7 @@
           [WARNING] Failed to get Toolkit version from composer.lock.
 
         Minimum version: ^10.0
-        Current version: 10.0.0-beta2
+        Current version: 10.0.0-beta3
         Version check: OK
 
 - command: toolkit:check-version
@@ -75,7 +75,7 @@
         >  Checking Toolkit version:
 
         Minimum version: ^10.0
-        Current version: 10.0.0-beta2
+        Current version: 10.0.0-beta3
         Version check: OK
 
 - command: toolkit:vendor-list