mirror of
https://github.com/Sylius/Sylius.git
synced 2026-07-14 09:02:12 +00:00
Merge branch '1.12' into 1.13
* 1.12: Ignore upmerge branches CI build on push event Update BuildTestApp actions within workflows
This commit is contained in:
commit
5f82cd5620
6 changed files with 8 additions and 61 deletions
4
.github/workflows/ci__minimal.yaml
vendored
4
.github/workflows/ci__minimal.yaml
vendored
|
|
@ -7,7 +7,9 @@ on:
|
|||
- "docs/**"
|
||||
- "*.md"
|
||||
workflow_dispatch: ~
|
||||
push: ~
|
||||
push:
|
||||
branches-ignore:
|
||||
- 'upmerge/**'
|
||||
|
||||
concurrency:
|
||||
group: ci-${{ github.workflow }}-${{ github.ref }}-minimal
|
||||
|
|
|
|||
13
.github/workflows/ci_e2e-custom.yaml
vendored
13
.github/workflows/ci_e2e-custom.yaml
vendored
|
|
@ -38,24 +38,13 @@ jobs:
|
|||
if: "${{ inputs.branch == '' }}"
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Get Composer cache directory
|
||||
id: composer-cache
|
||||
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: "Restore dependencies"
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: ${{ steps.composer-cache.outputs.dir }}
|
||||
key: "${{ github.run_id }}-${{ runner.os }}-${{ hashFiles('composer.json') }}-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-"
|
||||
restore-keys: "${{ github.run_id }}-${{ runner.os }}-${{ hashFiles('composer.json') }}-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-"
|
||||
|
||||
- name: Change minimum-stability to dev
|
||||
run: |
|
||||
composer config minimum-stability dev
|
||||
composer config prefer-stable true
|
||||
|
||||
- name: Build application
|
||||
uses: jakubtobiasz/SyliusBuildTestAppAction@v2.0
|
||||
uses: SyliusLabs/BuildTestAppAction@v2.0
|
||||
with:
|
||||
build_type: "sylius"
|
||||
cache_key: "${{ github.run_id }}-${{ runner.os }}-${{ hashFiles('composer.json') }}-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-"
|
||||
|
|
|
|||
13
.github/workflows/ci_e2e-mariadb.yaml
vendored
13
.github/workflows/ci_e2e-mariadb.yaml
vendored
|
|
@ -62,23 +62,12 @@ jobs:
|
|||
if: "${{ inputs.branch == '' }}"
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Get Composer cache directory
|
||||
id: composer-cache
|
||||
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: "Restore dependencies"
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: ${{ steps.composer-cache.outputs.dir }}
|
||||
key: "${{ github.run_id }}-${{ runner.os }}-${{ hashFiles('composer.json') }}-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-"
|
||||
restore-keys: "${{ github.run_id }}-${{ runner.os }}-${{ hashFiles('composer.json') }}-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-"
|
||||
|
||||
- name: Restrict packages
|
||||
if: matrix.dbal == '^2.7'
|
||||
run: composer require --no-update --no-scripts --no-interaction "doctrine/dbal:${{ matrix.dbal }}"
|
||||
|
||||
- name: Build application
|
||||
uses: jakubtobiasz/SyliusBuildTestAppAction@v2.0
|
||||
uses: SyliusLabs/BuildTestAppAction@v2.0
|
||||
with:
|
||||
build_type: "sylius"
|
||||
cache_key: "${{ github.run_id }}-${{ runner.os }}-${{ hashFiles('composer.json') }}-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-"
|
||||
|
|
|
|||
13
.github/workflows/ci_e2e-mysql.yaml
vendored
13
.github/workflows/ci_e2e-mysql.yaml
vendored
|
|
@ -61,17 +61,6 @@ jobs:
|
|||
- name: "Checkout"
|
||||
if: "${{ inputs.branch == '' }}"
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Get Composer cache directory
|
||||
id: composer-cache
|
||||
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: "Restore dependencies"
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: ${{ steps.composer-cache.outputs.dir }}
|
||||
key: "${{ github.run_id }}-${{ runner.os }}-${{ hashFiles('composer.json') }}-symfony-${{ matrix.symfony }}-api-platform-${{ matrix.api-platform }}"
|
||||
restore-keys: "${{ github.run_id }}-${{ runner.os }}-${{ hashFiles('composer.json') }}-symfony-${{ matrix.symfony }}-api-platform-${{ matrix.api-platform }}"
|
||||
|
||||
- name: Restrict Twig
|
||||
if: matrix.twig == '^2.12'
|
||||
|
|
@ -82,7 +71,7 @@ jobs:
|
|||
run: composer require --no-update --no-scripts --no-interaction "doctrine/dbal:${{ matrix.dbal }}"
|
||||
|
||||
- name: Build application
|
||||
uses: jakubtobiasz/SyliusBuildTestAppAction@v2.0
|
||||
uses: SyliusLabs/BuildTestAppAction@v2.0
|
||||
with:
|
||||
build_type: "sylius"
|
||||
cache_key: "${{ github.run_id }}-${{ runner.os }}-${{ hashFiles('composer.json') }}-symfony-${{ matrix.symfony }}-api-platform-${{ matrix.api-platform }}"
|
||||
|
|
|
|||
13
.github/workflows/ci_e2e-pgsql.yaml
vendored
13
.github/workflows/ci_e2e-pgsql.yaml
vendored
|
|
@ -53,19 +53,8 @@ jobs:
|
|||
if: "${{ inputs.branch == '' }}"
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Get Composer cache directory
|
||||
id: composer-cache
|
||||
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: "Restore dependencies"
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: ${{ steps.composer-cache.outputs.dir }}
|
||||
key: "${{ github.run_id }}-${{ runner.os }}-${{ hashFiles('composer.json') }}-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-"
|
||||
restore-keys: "${{ github.run_id }}-${{ runner.os }}-${{ hashFiles('composer.json') }}-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-"
|
||||
|
||||
- name: Build application
|
||||
uses: jakubtobiasz/SyliusBuildTestAppAction@v2.0
|
||||
uses: SyliusLabs/BuildTestAppAction@v2.0
|
||||
with:
|
||||
build_type: "sylius"
|
||||
cache_key: "${{ github.run_id }}-${{ runner.os }}-${{ hashFiles('composer.json') }}-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-"
|
||||
|
|
|
|||
13
.github/workflows/ci_e2e-unstable.yaml
vendored
13
.github/workflows/ci_e2e-unstable.yaml
vendored
|
|
@ -31,24 +31,13 @@ jobs:
|
|||
-
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Get Composer cache directory
|
||||
id: composer-cache
|
||||
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: "Restore dependencies"
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: ${{ steps.composer-cache.outputs.dir }}
|
||||
key: "${{ github.run_id }}-${{ runner.os }}-${{ hashFiles('composer.json') }}-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-"
|
||||
restore-keys: "${{ github.run_id }}-${{ runner.os }}-${{ hashFiles('composer.json') }}-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-"
|
||||
|
||||
- name: Change minimum-stability to dev
|
||||
run: |
|
||||
composer config minimum-stability dev
|
||||
composer config prefer-stable false
|
||||
|
||||
- name: Build application
|
||||
uses: jakubtobiasz/SyliusBuildTestAppAction@v2.0
|
||||
uses: SyliusLabs/BuildTestAppAction@v2.0
|
||||
with:
|
||||
build_type: "sylius"
|
||||
cache_key: "${{ github.run_id }}-${{ runner.os }}-${{ hashFiles('composer.json') }}-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-"
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue