Merge branch '1.14' into 2.0

* 1.14:
  [CI] Minor refactor in full builds
  [CI] Adjust titles in custom build
This commit is contained in:
Grzegorz Sadowski 2024-09-20 11:05:09 +02:00
commit 2ec046ca5d
No known key found for this signature in database
GPG key ID: EF87FF4E6E3BD364
4 changed files with 23 additions and 23 deletions

View file

@ -3,7 +3,7 @@ name: Continuous Integration 1.13 (Full)
on:
schedule:
-
cron: "0 2 * * *" # Run every day at 2am
cron: "0 1 * * *" # Run every day at 1am
workflow_dispatch: ~
concurrency:
@ -17,7 +17,7 @@ jobs:
static-checks:
strategy:
matrix:
branch: [ "1.13" ]
branch: ["1.13"]
name: "[${{ matrix.branch }}] Static checks"
uses: ./.github/workflows/ci_static-checks.yaml
with:
@ -26,7 +26,7 @@ jobs:
e2e-mariadb:
strategy:
matrix:
branch: [ "1.13" ]
branch: ["1.13"]
name: "[${{ matrix.branch }}] End-to-end tests (MariaDB)"
needs: static-checks
uses: ./.github/workflows/ci_e2e-mariadb.yaml
@ -36,7 +36,7 @@ jobs:
e2e-mysql:
strategy:
matrix:
branch: [ "1.13" ]
branch: ["1.13"]
name: "[${{ matrix.branch }}] End-to-end tests (MySQL)"
needs: static-checks
uses: ./.github/workflows/ci_e2e-mysql.yaml
@ -46,7 +46,7 @@ jobs:
e2e-pgsql:
strategy:
matrix:
branch: [ "1.13" ]
branch: ["1.13"]
name: "[${{ matrix.branch }}] End-to-end tests (PostgreSQL)"
needs: static-checks
uses: ./.github/workflows/ci_e2e-pgsql.yaml
@ -56,7 +56,7 @@ jobs:
e2e-custom:
strategy:
matrix:
branch: [ "1.13" ]
branch: ["1.13"]
name: "[${{ matrix.branch }}] End-to-end tests (Custom)"
needs: static-checks
uses: ./.github/workflows/ci_e2e-custom.yaml
@ -72,7 +72,7 @@ jobs:
packages:
strategy:
matrix:
branch: [ "1.13" ]
branch: ["1.13"]
name: "[${{ matrix.branch }}] Packages"
needs: static-checks
uses: ./.github/workflows/ci_packages.yaml

View file

@ -3,11 +3,11 @@ name: Continuous Integration 1.14 (Full)
on:
schedule:
-
cron: "0 1 * * *" # Run every day at 1am
cron: "0 2 * * *" # Run every day at 2am
workflow_dispatch: ~
concurrency:
group: ci-${{ github.workflow }}-${{ github.ref }}-1_12-full
group: ci-${{ github.workflow }}-${{ github.ref }}-1_14-full
cancel-in-progress: true
permissions:
@ -17,7 +17,7 @@ jobs:
static-checks:
strategy:
matrix:
branch: [ "1.14" ]
branch: ["1.14"]
name: "[${{ matrix.branch }}] Static checks"
uses: ./.github/workflows/ci_static-checks.yaml
with:
@ -26,7 +26,7 @@ jobs:
e2e-mariadb:
strategy:
matrix:
branch: [ "1.14" ]
branch: ["1.14"]
name: "[${{ matrix.branch }}] End-to-end tests (MariaDB)"
needs: static-checks
uses: ./.github/workflows/ci_e2e-mariadb.yaml
@ -36,7 +36,7 @@ jobs:
e2e-mysql:
strategy:
matrix:
branch: [ "1.14" ]
branch: ["1.14"]
name: "[${{ matrix.branch }}] End-to-end tests (MySQL)"
needs: static-checks
uses: ./.github/workflows/ci_e2e-mysql.yaml
@ -46,7 +46,7 @@ jobs:
e2e-pgsql:
strategy:
matrix:
branch: [ "1.14" ]
branch: ["1.14"]
name: "[${{ matrix.branch }}] End-to-end tests (PostgreSQL)"
needs: static-checks
uses: ./.github/workflows/ci_e2e-pgsql.yaml
@ -56,7 +56,7 @@ jobs:
e2e-custom:
strategy:
matrix:
branch: [ "1.14" ]
branch: ["1.14"]
name: "[${{ matrix.branch }}] End-to-end tests (Custom)"
needs: static-checks
uses: ./.github/workflows/ci_e2e-custom.yaml
@ -72,7 +72,7 @@ jobs:
packages:
strategy:
matrix:
branch: [ "1.14" ]
branch: ["1.14"]
name: "[${{ matrix.branch }}] Packages"
needs: static-checks
uses: ./.github/workflows/ci_packages.yaml

View file

@ -17,7 +17,7 @@ jobs:
static-checks:
strategy:
matrix:
branch: [ "2.0" ]
branch: ["2.0"]
name: "[${{ matrix.branch }}] Static checks"
uses: ./.github/workflows/ci_static-checks.yaml
with:
@ -26,7 +26,7 @@ jobs:
e2e-mariadb:
strategy:
matrix:
branch: [ "2.0" ]
branch: ["2.0"]
name: "[${{ matrix.branch }}] End-to-end tests (MariaDB)"
needs: static-checks
uses: ./.github/workflows/ci_e2e-mariadb.yaml
@ -36,7 +36,7 @@ jobs:
e2e-mysql:
strategy:
matrix:
branch: [ "2.0" ]
branch: ["2.0"]
name: "[${{ matrix.branch }}] End-to-end tests (MySQL)"
needs: static-checks
uses: ./.github/workflows/ci_e2e-mysql.yaml
@ -46,7 +46,7 @@ jobs:
e2e-pgsql:
strategy:
matrix:
branch: [ "2.0" ]
branch: ["2.0"]
name: "[${{ matrix.branch }}] End-to-end tests (PostgreSQL)"
needs: static-checks
uses: ./.github/workflows/ci_e2e-pgsql.yaml
@ -56,7 +56,7 @@ jobs:
e2e-custom:
strategy:
matrix:
branch: [ "2.0" ]
branch: ["2.0"]
name: "[${{ matrix.branch }}] End-to-end tests (Custom)"
needs: static-checks
uses: ./.github/workflows/ci_e2e-custom.yaml
@ -72,7 +72,7 @@ jobs:
packages:
strategy:
matrix:
branch: [ "2.0" ]
branch: ["2.0"]
name: "[${{ matrix.branch }}] Packages"
needs: static-checks
uses: ./.github/workflows/ci_packages.yaml

View file

@ -16,7 +16,7 @@ permissions:
jobs:
behat-no-js-unstable-dependencies:
runs-on: ubuntu-latest
name: "Non-JS, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, MySQL ${{ matrix.mysql }}, Resource ${{ matrix.resource }}, Grid ${{ matrix.grid }} (Unstable Dependencies)"
name: "Non-JS, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, MySQL ${{ matrix.mysql }}, Resource ${{ matrix.resource }}, Grid ${{ matrix.grid }}, Mailer ${{ matrix.mailer }} (Unstable Dependencies)"
timeout-minutes: 45
continue-on-error: true
strategy:
@ -113,7 +113,7 @@ jobs:
uses: actions/upload-artifact@v3
if: failure()
with:
name: "Logs (non-JS, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}) [Unstable], MySQL ${{ matrix.mysql }})"
name: "Logs (non-JS, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, MySQL ${{ matrix.mysql }}, Resource ${{ matrix.resource }}, Grid ${{ matrix.grid }}, Mailer ${{ matrix.mailer }})"
path: |
etc/build/
var/log