Merge pull request #2372 from sigwinhq/infra/versions

coreshop · Sep 15, 2023 · 3b1ca33 · 3b1ca33
2 parents a5cf24a + 4b5dd9d
commit 3b1ca33
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.gitsplit.yml b/.gitsplit.yml
@@ -4,12 +4,13 @@ origins:
     - ^next$
     - ^\d+\.\d+$
     - ^\d+\.\d+\.\d+$
+    - '^\d+\.\d+\.\d+(?:-?(?:alpha|beta|rc)\.?\d*)?$'
 splits:
     - { prefix: src/CoreShop/Component/Address, target: 'https://${GH_TOKEN}@github.com/coreshop/Address.git' }
     - { prefix: src/CoreShop/Bundle/AddressBundle, target: 'https://${GH_TOKEN}@github.com/coreshop/AddressBundle.git' }
+    - { prefix: src/CoreShop/Bundle/ClassDefinitionPatchBundle, target: 'https://${GH_TOKEN}@github.com/coreshop/ClassDefinitionPatchBundle.git' }
     - { prefix: src/CoreShop/Component/Configuration, target: 'https://${GH_TOKEN}@github.com/coreshop/Configuration.git' }
     - { prefix: src/CoreShop/Bundle/ConfigurationBundle, target: 'https://${GH_TOKEN}@github.com/coreshop/ConfigurationBundle.git' }
-    - { prefix: src/CoreShop/Bundle/ClassDefinitionPatchBundle, target: 'https://${GH_TOKEN}@github.com/coreshop/ClassDefinitionPatchBundle.git' }
     - { prefix: src/CoreShop/Component/Core, target: 'https://${GH_TOKEN}@github.com/coreshop/Core.git' }
     - { prefix: src/CoreShop/Bundle/CoreBundle, target: 'https://${GH_TOKEN}@github.com/coreshop/CoreBundle.git' }
     - { prefix: src/CoreShop/Component/Currency, target: 'https://${GH_TOKEN}@github.com/coreshop/Currency.git' }

diff --git a/bin/generate-gitsplit b/bin/generate-gitsplit
@@ -30,9 +30,10 @@ $config = [
     'cache_url' => 'file://cache',
     'project_url' => 'https://@github.com/coreshop/CoreShop.git',
     'origins' => [
-        '^master$',
-        '^\d+\.\d+$', #CoreShop Branches
-        '^\d+\.\d+\.\d+$', #Tags
+        '^next$', // main branch
+        '^\d+\.\d+$', // CoreShop Branches
+        '^\d+\.\d+\.\d+$', // releases
+        '^\d+\.\d+\.\d+(?:-?(?:alpha|beta|rc)\.?\d*)?$', // pre-releases
     ],
     'splits' => [],
 ];