diff --git a/Build/gitlab-ci.yml b/Build/gitlab-ci.yml index aac529d1d223cf2801e8c8325dc232511b545cae..c2986de13384bddfe3183be784d7b3d868722408 100644 --- a/Build/gitlab-ci.yml +++ b/Build/gitlab-ci.yml @@ -5,7 +5,7 @@ default: timeout: 30m variables: - # When a branch derives from master or 10.4 or something, composer stumbles + # When a branch derives from main or 10.4 or something, composer stumbles # if the repos has been 'shallow cloned', can't determine the source branch # and fails with package conflicts. Having a full clone by setting depth 0 # prevents this, so we don't need to fiddle with COMPOSER_ROOT_VERSION env var. @@ -26,13 +26,13 @@ cache: # General rule: Keep them as small as possibles since that is less unpack work. # Jobs that do the same thing, should use the same key. Jobs that derivate from # defaults, should have an own cache. - # Examples: master-composer, master-composer-js, master-composer-min-js, 10.4-composer + # Examples: main-composer, main-composer-js, main-composer-min-js, 10.4-composer # For job runtime, it does not matter much if there are many caches, # it is more important that single jobs don't unpack too much every time. - # The default key is: "Cache everything created by a 'composer install' for master branch. + # The default key is: "Cache everything created by a 'composer install' for main branch. # This means jobs using this default key should not create additional stuff in .cache # directory, for instance by calling a 'yarn install' or 'composer min' or similar. - key: master-composer + key: main-composer paths: - .cache diff --git a/Build/gitlab-ci/nightly/acceptance-application.yml b/Build/gitlab-ci/nightly/acceptance-application.yml index df0434aea5feabd6bac4d05b6035b56ccb6cb8dd..6c7149f62c4ffec3fb414e1ddf10e54bc5b077de 100644 --- a/Build/gitlab-ci/nightly/acceptance-application.yml +++ b/Build/gitlab-ci/nightly/acceptance-application.yml @@ -16,7 +16,7 @@ acceptance application mariadb php 7.4 max: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache artifacts: @@ -33,7 +33,7 @@ acceptance application mariadb php 7.4 min: only: - schedules cache: - key: master-composer-min + key: main-composer-min paths: - .cache artifacts: @@ -64,7 +64,7 @@ acceptance application mariadb php 8.0 max: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache artifacts: @@ -81,7 +81,7 @@ acceptance application mariadb php 8.0 min: only: - schedules cache: - key: master-composer-min + key: main-composer-min paths: - .cache artifacts: @@ -112,7 +112,7 @@ acceptance application mariadb php 8.1 max: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache artifacts: @@ -129,7 +129,7 @@ acceptance application mariadb php 8.1 min: only: - schedules cache: - key: master-composer-min + key: main-composer-min paths: - .cache artifacts: diff --git a/Build/gitlab-ci/nightly/acceptance-install.yml b/Build/gitlab-ci/nightly/acceptance-install.yml index 8709115964ca571b5e6b71669859a303bcceb92f..ae991b274507fda2ff32dc4a28eef5c38b8d7150 100644 --- a/Build/gitlab-ci/nightly/acceptance-install.yml +++ b/Build/gitlab-ci/nightly/acceptance-install.yml @@ -14,7 +14,7 @@ acceptance install mariadb php 7.4 max: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache artifacts: @@ -29,7 +29,7 @@ acceptance install mariadb php 7.4 min: only: - schedules cache: - key: master-composer-min + key: main-composer-min paths: - .cache artifacts: @@ -56,7 +56,7 @@ acceptance install mariadb php 8.0 max: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache artifacts: @@ -71,7 +71,7 @@ acceptance install mariadb php 8.0 min: only: - schedules cache: - key: master-composer-min + key: main-composer-min paths: - .cache artifacts: @@ -98,7 +98,7 @@ acceptance install mariadb php 8.1 max: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache artifacts: @@ -113,7 +113,7 @@ acceptance install mariadb php 8.1 min: only: - schedules cache: - key: master-composer-min + key: main-composer-min paths: - .cache artifacts: @@ -140,7 +140,7 @@ acceptance install mysql php 7.4 max: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache artifacts: @@ -155,7 +155,7 @@ acceptance install mysql php 7.4 min: only: - schedules cache: - key: master-composer-min + key: main-composer-min paths: - .cache artifacts: @@ -182,7 +182,7 @@ acceptance install mysql php 8.0 max: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache artifacts: @@ -197,7 +197,7 @@ acceptance install mysql php 8.0 min: only: - schedules cache: - key: master-composer-min + key: main-composer-min paths: - .cache artifacts: @@ -224,7 +224,7 @@ acceptance install mysql php 8.1 max: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache artifacts: @@ -239,7 +239,7 @@ acceptance install mysql php 8.1 min: only: - schedules cache: - key: master-composer-min + key: main-composer-min paths: - .cache artifacts: @@ -266,7 +266,7 @@ acceptance install postgres php 7.4 max: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache artifacts: @@ -281,7 +281,7 @@ acceptance install postgres php 7.4 min: only: - schedules cache: - key: master-composer-min + key: main-composer-min paths: - .cache artifacts: @@ -308,7 +308,7 @@ acceptance install postgres php 8.0 max: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache artifacts: @@ -323,7 +323,7 @@ acceptance install postgres php 8.0 min: only: - schedules cache: - key: master-composer-min + key: main-composer-min paths: - .cache artifacts: @@ -350,7 +350,7 @@ acceptance install postgres php 8.1 max: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache artifacts: @@ -365,7 +365,7 @@ acceptance install postgres php 8.1 min: only: - schedules cache: - key: master-composer-min + key: main-composer-min paths: - .cache artifacts: @@ -392,7 +392,7 @@ acceptance install sqlite php 7.4 max: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache artifacts: diff --git a/Build/gitlab-ci/nightly/functional.yml b/Build/gitlab-ci/nightly/functional.yml index d67c8928229b2f3fc0f1dcfb739531acb88f147e..0fcd9973b85cfd669e170ba43785fa3de58d1e88 100644 --- a/Build/gitlab-ci/nightly/functional.yml +++ b/Build/gitlab-ci/nightly/functional.yml @@ -10,7 +10,7 @@ functional deprecated mariadb 10.3 php 7.4 max: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache script: @@ -21,7 +21,7 @@ functional deprecated mariadb 10.3 php 7.4 min: only: - schedules cache: - key: master-composer-min + key: main-composer-min paths: - .cache script: @@ -40,7 +40,7 @@ functional deprecated mariadb 10.5 php 8.0 max: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache script: @@ -51,7 +51,7 @@ functional deprecated mariadb 10.5 php 8.0 min: only: - schedules cache: - key: master-composer-min + key: main-composer-min paths: - .cache script: @@ -70,7 +70,7 @@ functional deprecated mssql php 7.4 max: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache script: @@ -81,7 +81,7 @@ functional deprecated mssql php 7.4 min: only: - schedules cache: - key: master-composer-min + key: main-composer-min paths: - .cache script: @@ -100,7 +100,7 @@ functional deprecated mysql 5.5 php 7.4 max: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache script: @@ -111,7 +111,7 @@ functional deprecated mysql 5.5 php 7.4 min: only: - schedules cache: - key: master-composer-min + key: main-composer-min paths: - .cache script: @@ -130,7 +130,7 @@ functional deprecated postgres 10 php 7.4 max: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache script: @@ -141,7 +141,7 @@ functional deprecated postgres 10 php 7.4 min: only: - schedules cache: - key: master-composer-min + key: main-composer-min paths: - .cache script: @@ -160,7 +160,7 @@ functional deprecated sqlite php 8.1 max: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache script: @@ -171,7 +171,7 @@ functional deprecated sqlite php 8.1 min: only: - schedules cache: - key: master-composer-min + key: main-composer-min paths: - .cache script: @@ -192,7 +192,7 @@ functional mariadb 10.3 php 7.4 max: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache parallel: 6 @@ -204,7 +204,7 @@ functional mariadb 10.3 php 7.4 min: only: - schedules cache: - key: master-composer-min + key: main-composer-min paths: - .cache parallel: 6 @@ -225,7 +225,7 @@ functional mariadb 10.5 php 8.1 max: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache parallel: 6 @@ -237,7 +237,7 @@ functional mariadb 10.5 php 8.1 min: only: - schedules cache: - key: master-composer-min + key: main-composer-min paths: - .cache parallel: 6 @@ -258,7 +258,7 @@ functional mssql php 7.4 max: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache parallel: 12 @@ -270,7 +270,7 @@ functional mssql php 7.4 min: only: - schedules cache: - key: master-composer-min + key: main-composer-min paths: - .cache parallel: 12 @@ -291,7 +291,7 @@ functional mysql 5.5 php 7.4 max: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache parallel: 6 diff --git a/Build/gitlab-ci/nightly/integrity.yml b/Build/gitlab-ci/nightly/integrity.yml index 5315ee241354c20ef18a3e6332c2d82ec79f3bfb..693eca4039f2aa7b46c384f180f6b5ae2ed298b6 100644 --- a/Build/gitlab-ci/nightly/integrity.yml +++ b/Build/gitlab-ci/nightly/integrity.yml @@ -26,7 +26,7 @@ grunt clean: only: - schedules cache: - key: master-js + key: main-js paths: - .cache script: @@ -37,7 +37,7 @@ integration various: only: - schedules cache: - key: master-composer-phpmixed + key: main-composer-phpmixed paths: - .cache script: @@ -80,7 +80,7 @@ lint scss ts html: only: - schedules cache: - key: master-js + key: main-js paths: - .cache script: @@ -93,7 +93,7 @@ phpstan php 7.4: only: - schedules cache: - key: master-composer-phpstan-74 + key: main-composer-phpstan-74 paths: - .cache script: @@ -105,7 +105,7 @@ phpstan php 8.0: only: - schedules cache: - key: master-composer-phpstan-80 + key: main-composer-phpstan-80 paths: - .cache script: diff --git a/Build/gitlab-ci/nightly/unit.yml b/Build/gitlab-ci/nightly/unit.yml index 33471b19318ffefe9669f8abcd558fcf3f40d55c..6eb428400ad1140834d9390d278d8ef98328221b 100644 --- a/Build/gitlab-ci/nightly/unit.yml +++ b/Build/gitlab-ci/nightly/unit.yml @@ -3,7 +3,7 @@ unit javascript: only: - schedules cache: - key: master-composer-js + key: main-composer-js paths: - .cache script: @@ -37,7 +37,7 @@ unit php 7.4 max: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache script: @@ -48,7 +48,7 @@ unit php 7.4 max deprecated: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache script: @@ -59,7 +59,7 @@ unit php 7.4 max random: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache script: @@ -71,7 +71,7 @@ unit php 7.4 min: only: - schedules cache: - key: master-composer-min + key: main-composer-min paths: - .cache script: @@ -82,7 +82,7 @@ unit php 7.4 min deprecated: only: - schedules cache: - key: master-composer-min + key: main-composer-min paths: - .cache script: @@ -93,7 +93,7 @@ unit php 7.4 min random: only: - schedules cache: - key: master-composer-min + key: main-composer-min paths: - .cache script: @@ -127,7 +127,7 @@ unit php 8.0 max: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache script: @@ -138,7 +138,7 @@ unit php 8.0 max deprecated: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache script: @@ -149,7 +149,7 @@ unit php 8.0 max random: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache script: @@ -161,7 +161,7 @@ unit php 8.0 min: only: - schedules cache: - key: master-composer-min + key: main-composer-min paths: - .cache script: @@ -172,7 +172,7 @@ unit php 8.0 min deprecated: only: - schedules cache: - key: master-composer-min + key: main-composer-min paths: - .cache script: @@ -183,7 +183,7 @@ unit php 8.0 min random: only: - schedules cache: - key: master-composer-min + key: main-composer-min paths: - .cache script: @@ -217,7 +217,7 @@ unit php 8.1 max: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache script: @@ -228,7 +228,7 @@ unit php 8.1 max deprecated: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache script: @@ -239,7 +239,7 @@ unit php 8.1 max random: only: - schedules cache: - key: master-composer-max + key: main-composer-max paths: - .cache script: @@ -251,7 +251,7 @@ unit php 8.1 min: only: - schedules cache: - key: master-composer-min + key: main-composer-min paths: - .cache script: @@ -262,7 +262,7 @@ unit php 8.1 min deprecated: only: - schedules cache: - key: master-composer-min + key: main-composer-min paths: - .cache script: @@ -273,7 +273,7 @@ unit php 8.1 min random: only: - schedules cache: - key: master-composer-min + key: main-composer-min paths: - .cache script: diff --git a/Build/gitlab-ci/pre-merge/acceptance-application.yml b/Build/gitlab-ci/pre-merge/acceptance-application.yml index eb582e87060104121f85f7a4ac22a651ee0256ff..d81bbea0c43b4d9e427d4904296e9b873360338e 100644 --- a/Build/gitlab-ci/pre-merge/acceptance-application.yml +++ b/Build/gitlab-ci/pre-merge/acceptance-application.yml @@ -3,7 +3,7 @@ acceptance application mariadb php 7.4 pre-merge: except: refs: - schedules - - master + - main artifacts: when: on_failure paths: @@ -19,7 +19,7 @@ acceptance application mariadb php 8.1 pre-merge: except: refs: - schedules - - master + - main artifacts: when: on_failure paths: diff --git a/Build/gitlab-ci/pre-merge/acceptance-install.yml b/Build/gitlab-ci/pre-merge/acceptance-install.yml index 429d45e2de1bdd9becc6f3127b36d30bec8df1b9..987ef686610a36a4fc8630782ab7728315aed161 100644 --- a/Build/gitlab-ci/pre-merge/acceptance-install.yml +++ b/Build/gitlab-ci/pre-merge/acceptance-install.yml @@ -3,7 +3,7 @@ acceptance install mariadb php 7.4 pre-merge: except: refs: - schedules - - master + - main artifacts: when: on_failure paths: @@ -17,7 +17,7 @@ acceptance install mysql php 8.1 pre-merge: except: refs: - schedules - - master + - main artifacts: when: on_failure paths: @@ -31,7 +31,7 @@ acceptance install postgres php 7.4 pre-merge: except: refs: - schedules - - master + - main artifacts: when: on_failure paths: @@ -45,7 +45,7 @@ acceptance install sqlite php 8.1 pre-merge: except: refs: - schedules - - master + - main artifacts: when: on_failure paths: diff --git a/Build/gitlab-ci/pre-merge/early.yml b/Build/gitlab-ci/pre-merge/early.yml index bcf7886f1e6fa82750e16ec4e6c5d734f81ad9ce..bc7464ed630f854d577fcc8ee32d1e6076fd23cf 100644 --- a/Build/gitlab-ci/pre-merge/early.yml +++ b/Build/gitlab-ci/pre-merge/early.yml @@ -3,7 +3,7 @@ cgl pre-merge: except: refs: - schedules - - master + - main script: - Build/Scripts/runTests.sh -s composerInstall -p 7.4 - Build/Scripts/runTests.sh -s cglGit -n -p 7.4 @@ -13,6 +13,6 @@ composer validate pre-merge: except: refs: - schedules - - master + - main script: - Build/Scripts/runTests.sh -s composerValidate -p 7.4 diff --git a/Build/gitlab-ci/pre-merge/functional.yml b/Build/gitlab-ci/pre-merge/functional.yml index 62df7b75f6e0c66c68d14ab86bea8a8b60883af9..42d7e410827d0ccecb60b1b676e8e162138b7b6e 100644 --- a/Build/gitlab-ci/pre-merge/functional.yml +++ b/Build/gitlab-ci/pre-merge/functional.yml @@ -3,7 +3,7 @@ functional deprecated mariadb 10.3 php 8.1 pre-merge: except: refs: - schedules - - master + - main script: - Build/Scripts/runTests.sh -s composerInstall -p 8.1 - Build/Scripts/runTests.sh -s functionalDeprecated -d mariadb -i 10.3 -p 8.1 @@ -13,7 +13,7 @@ functional deprecated postgres 10 php 7.4 pre-merge: except: refs: - schedules - - master + - main script: - Build/Scripts/runTests.sh -s composerInstall -p 7.4 - Build/Scripts/runTests.sh -s functionalDeprecated -d postgres -k 10 -p 7.4 @@ -23,7 +23,7 @@ functional mariadb 10.3 php 8.0 pre-merge: except: refs: - schedules - - master + - main parallel: 6 script: - Build/Scripts/runTests.sh -s composerInstall -p 8.0 @@ -34,7 +34,7 @@ functional postgres 10 php 8.1 pre-merge: except: refs: - schedules - - master + - main parallel: 10 script: - Build/Scripts/runTests.sh -s composerInstall -p 8.1 @@ -45,7 +45,7 @@ functional sqlite php 7.4 pre-merge: except: refs: - schedules - - master + - main parallel: 5 script: - Build/Scripts/runTests.sh -s composerInstall -p 7.4 diff --git a/Build/gitlab-ci/pre-merge/integrity.yml b/Build/gitlab-ci/pre-merge/integrity.yml index 8a80c681297ab332a5ab599a94d3537093e88451..d6b73b9a1caec25e696f4f7f05de030c82f08eb5 100644 --- a/Build/gitlab-ci/pre-merge/integrity.yml +++ b/Build/gitlab-ci/pre-merge/integrity.yml @@ -3,7 +3,7 @@ annotations php 7.4 pre-merge: except: refs: - schedules - - master + - main script: - Build/Scripts/runTests.sh -s composerInstall -p 7.4 - Build/Scripts/runTests.sh -s checkAnnotations -p 7.4 @@ -13,9 +13,9 @@ grunt clean pre-merge: except: refs: - schedules - - master + - main cache: - key: master-js + key: main-js paths: - .cache script: @@ -26,9 +26,9 @@ integration various pre-merge: except: refs: - schedules - - master + - main cache: - key: master-composer-phpmixed + key: main-composer-phpmixed paths: - .cache script: @@ -52,9 +52,9 @@ lint scss ts html pre-merge: except: refs: - schedules - - master + - main cache: - key: master-js + key: main-js paths: - .cache script: @@ -67,9 +67,9 @@ phpstan php 7.4 pre-merge: except: refs: - schedules - - master + - main cache: - key: master-composer-phpstan-74 + key: main-composer-phpstan-74 paths: - .cache script: @@ -81,9 +81,9 @@ phpstan php 8.0 pre-merge: except: refs: - schedules - - master + - main cache: - key: master-composer-phpstan-80 + key: main-composer-phpstan-80 paths: - .cache script: diff --git a/Build/gitlab-ci/pre-merge/unit.yml b/Build/gitlab-ci/pre-merge/unit.yml index 8cd1e28d5482f8e10207ab4a0c0ea2a29ea805d3..60bf50cdda8702f5e37da5424b1ec9c43b7ec92c 100644 --- a/Build/gitlab-ci/pre-merge/unit.yml +++ b/Build/gitlab-ci/pre-merge/unit.yml @@ -3,9 +3,9 @@ unit javascript pre-merge: except: refs: - schedules - - master + - main cache: - key: master-composer-js + key: main-composer-js paths: - .cache script: @@ -17,7 +17,7 @@ unit php 7.4 deprecated pre-merge: except: refs: - schedules - - master + - main script: - Build/Scripts/runTests.sh -s composerInstall -p 7.4 - Build/Scripts/runTests.sh -s unitDeprecated -p 7.4 @@ -26,7 +26,7 @@ unit php 7.4 pre-merge: except: refs: - schedules - - master + - main script: - Build/Scripts/runTests.sh -s composerInstall -p 7.4 - Build/Scripts/runTests.sh -s unit -p 7.4 @@ -35,7 +35,7 @@ unit php 7.4 random pre-merge: except: refs: - schedules - - master + - main script: - Build/Scripts/runTests.sh -s composerInstall -p 7.4 - Build/Scripts/runTests.sh -s unitRandom -p 7.4 @@ -45,7 +45,7 @@ unit php 8.1 deprecated pre-merge: except: refs: - schedules - - master + - main script: - Build/Scripts/runTests.sh -s composerInstall -p 8.1 - Build/Scripts/runTests.sh -s unitDeprecated -p 8.1 @@ -54,7 +54,7 @@ unit php 8.1 pre-merge: except: refs: - schedules - - master + - main script: - Build/Scripts/runTests.sh -s composerInstall -p 8.1 - Build/Scripts/runTests.sh -s unit -p 8.1 @@ -63,7 +63,7 @@ unit php 8.1 random pre-merge: except: refs: - schedules - - master + - main script: - Build/Scripts/runTests.sh -s composerInstall -p 8.1 - Build/Scripts/runTests.sh -s unitRandom -p 8.1