From 708587331da67ad4274971f6eec9ac2d3ed4a9cd Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Mon, 29 Nov 2021 11:42:30 +0100
Subject: [PATCH] [TASK] gitlab-ci: Rename master to main
Change-Id: I13ca3c60a040c15aca8e259e7c65d33682f37c44
Resolves: #96131
Releases: main
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/72349
Tested-by: Benni Mack <benni@typo3.org>
Tested-by: core-ci <typo3@b13.com>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Benni Mack <benni@typo3.org>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
---
Build/gitlab-ci.yml | 8 ++--
.../nightly/acceptance-application.yml | 12 +++---
.../gitlab-ci/nightly/acceptance-install.yml | 38 +++++++++----------
Build/gitlab-ci/nightly/functional.yml | 38 +++++++++----------
Build/gitlab-ci/nightly/integrity.yml | 10 ++---
Build/gitlab-ci/nightly/unit.yml | 38 +++++++++----------
.../pre-merge/acceptance-application.yml | 4 +-
.../pre-merge/acceptance-install.yml | 8 ++--
Build/gitlab-ci/pre-merge/early.yml | 4 +-
Build/gitlab-ci/pre-merge/functional.yml | 10 ++---
Build/gitlab-ci/pre-merge/integrity.yml | 22 +++++------
Build/gitlab-ci/pre-merge/unit.yml | 16 ++++----
12 files changed, 104 insertions(+), 104 deletions(-)
diff --git a/Build/gitlab-ci.yml b/Build/gitlab-ci.yml
index aac529d1d223..c2986de13384 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 df0434aea5fe..6c7149f62c4f 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 8709115964ca..ae991b274507 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 d67c8928229b..0fcd9973b85c 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 5315ee241354..693eca4039f2 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 33471b19318f..6eb428400ad1 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 eb582e870601..d81bbea0c43b 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 429d45e2de1b..987ef686610a 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 bcf7886f1e6f..bc7464ed630f 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 62df7b75f6e0..42d7e410827d 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 8a80c681297a..d6b73b9a1cae 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 8cd1e28d5482..60bf50cdda87 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
--
GitLab