mirror of
https://github.com/Sylius/Sylius.git
synced 2026-07-15 17:40:58 +00:00
Merge branch '1.11' into 1.12
* 1.11: [CI] Remove unused step [CI] Update images [CI] Remove deprecations
This commit is contained in:
commit
04f28b328e
5 changed files with 44 additions and 52 deletions
68
.github/workflows/application.yml
vendored
68
.github/workflows/application.yml
vendored
|
|
@ -47,11 +47,11 @@ jobs:
|
|||
|
||||
steps:
|
||||
-
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
|
||||
-
|
||||
name: Get branch name
|
||||
uses: tj-actions/branch-names@v5.2
|
||||
uses: tj-actions/branch-names@v6.2
|
||||
id: branch-name
|
||||
|
||||
-
|
||||
|
|
@ -85,12 +85,12 @@ jobs:
|
|||
|
||||
-
|
||||
name: Get Composer cache directory
|
||||
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
|
||||
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
|
||||
id: composer-cache
|
||||
|
||||
-
|
||||
name: Cache Composer
|
||||
uses: actions/cache@v2
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: ${{ steps.composer-cache.outputs.dir }}
|
||||
key: ${{ runner.os }}-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-composer-${{ hashFiles('**/composer.json') }}
|
||||
|
|
@ -99,7 +99,7 @@ jobs:
|
|||
|
||||
-
|
||||
name: Cache composer.lock
|
||||
uses: actions/cache@v2
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: composer.lock
|
||||
key: ${{ steps.branch-name.outputs.base_ref_branch }}-${{ runner.os }}-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-composer-lock
|
||||
|
|
@ -107,7 +107,7 @@ jobs:
|
|||
${{ steps.branch-name.outputs.base_ref_branch }}-${{ runner.os }}-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-composer-lock
|
||||
-
|
||||
name: Check existence of composer.lock
|
||||
uses: andstor/file-existence-action@v1
|
||||
uses: andstor/file-existence-action@v2
|
||||
id: check-old-composer-lock-existence
|
||||
with:
|
||||
files: composer.lock
|
||||
|
|
@ -126,14 +126,6 @@ jobs:
|
|||
run: composer validate --strict --no-check-version
|
||||
if: always() && steps.end-of-setup.outcome == 'success'
|
||||
|
||||
-
|
||||
name: Generate composer diff
|
||||
uses: IonBazan/composer-diff-action@v1
|
||||
if: steps.check-old-composer-lock-existence.outputs.files_exists == 'true'
|
||||
id: composer_diff
|
||||
with:
|
||||
base: old-composer.lock
|
||||
|
||||
-
|
||||
name: Check for security vulnerabilities
|
||||
run: symfony security:check
|
||||
|
|
@ -192,7 +184,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
-
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
|
||||
-
|
||||
name: Run PHPArkitect
|
||||
|
|
@ -225,7 +217,7 @@ jobs:
|
|||
api-platform: "~2.6.0"
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v3
|
||||
|
||||
- name: Setup PHP
|
||||
uses: shivammathur/setup-php@v2
|
||||
|
|
@ -250,10 +242,10 @@ jobs:
|
|||
|
||||
- name: Get Composer cache directory
|
||||
id: composer-cache
|
||||
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
|
||||
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Cache Composer
|
||||
uses: actions/cache@v2
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: ${{ steps.composer-cache.outputs.dir }}
|
||||
key: ${{ runner.os }}-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-composer-${{ hashFiles('**/composer.json') }}
|
||||
|
|
@ -283,7 +275,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
-
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
-
|
||||
name: Shutdown default MySQL
|
||||
run: sudo service mysql stop
|
||||
|
|
@ -313,11 +305,11 @@ jobs:
|
|||
-
|
||||
name: Get Composer cache directory
|
||||
id: composer-cache
|
||||
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
|
||||
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
|
||||
|
||||
-
|
||||
name: Cache Composer
|
||||
uses: actions/cache@v2
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: ${{ steps.composer-cache.outputs.dir }}
|
||||
key: ${{ runner.os }}-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-composer-${{ hashFiles('**/composer.json') }}
|
||||
|
|
@ -431,7 +423,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
-
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
-
|
||||
name: Shutdown default MySQL
|
||||
run: sudo service mysql stop
|
||||
|
|
@ -467,11 +459,11 @@ jobs:
|
|||
-
|
||||
name: Get Composer cache directory
|
||||
id: composer-cache
|
||||
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
|
||||
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
|
||||
|
||||
-
|
||||
name: Cache Composer
|
||||
uses: actions/cache@v2
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: ${{ steps.composer-cache.outputs.dir }}
|
||||
key: ${{ runner.os }}-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-composer-${{ hashFiles('**/composer.json') }}
|
||||
|
|
@ -568,7 +560,7 @@ jobs:
|
|||
|
||||
-
|
||||
name: Upload Behat logs
|
||||
uses: actions/upload-artifact@v2
|
||||
uses: actions/upload-artifact@v3
|
||||
if: failure()
|
||||
with:
|
||||
name: "Behat logs (non-JS, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }})"
|
||||
|
|
@ -639,7 +631,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
-
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
|
||||
-
|
||||
name: Shutdown default MySQL
|
||||
|
|
@ -690,11 +682,11 @@ jobs:
|
|||
-
|
||||
name: Get Composer cache directory
|
||||
id: composer-cache
|
||||
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
|
||||
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
|
||||
|
||||
-
|
||||
name: Cache Composer
|
||||
uses: actions/cache@v2
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: ${{ steps.composer-cache.outputs.dir }}
|
||||
key: ${{ runner.os }}-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-composer-${{ hashFiles('**/composer.json') }}
|
||||
|
|
@ -793,7 +785,7 @@ jobs:
|
|||
|
||||
-
|
||||
name: Upload Behat logs
|
||||
uses: actions/upload-artifact@v2
|
||||
uses: actions/upload-artifact@v3
|
||||
if: failure()
|
||||
with:
|
||||
name: "Behat logs (non-JS, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }})"
|
||||
|
|
@ -828,7 +820,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
-
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
|
||||
-
|
||||
name: Shutdown default MySQL
|
||||
|
|
@ -870,11 +862,11 @@ jobs:
|
|||
-
|
||||
name: Get Composer cache directory
|
||||
id: composer-cache
|
||||
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
|
||||
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
|
||||
|
||||
-
|
||||
name: Cache Composer
|
||||
uses: actions/cache@v2
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: ${{ steps.composer-cache.outputs.dir }}
|
||||
key: ${{ runner.os }}-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-composer-${{ hashFiles('**/composer.json') }}
|
||||
|
|
@ -887,18 +879,18 @@ jobs:
|
|||
|
||||
-
|
||||
name: Setup Node
|
||||
uses: actions/setup-node@v2
|
||||
uses: actions/setup-node@v3
|
||||
with:
|
||||
node-version: "${{ matrix.node }}"
|
||||
|
||||
-
|
||||
name: Get Yarn cache directory
|
||||
id: yarn-cache
|
||||
run: echo "::set-output name=dir::$(yarn cache dir)"
|
||||
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
|
||||
|
||||
-
|
||||
name: Cache Yarn
|
||||
uses: actions/cache@v2
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: ${{ steps.yarn-cache.outputs.dir }}
|
||||
key: ${{ runner.os }}-node-${{ matrix.node }}-yarn-${{ hashFiles('**/package.json **/yarn.lock') }}
|
||||
|
|
@ -955,7 +947,7 @@ jobs:
|
|||
|
||||
-
|
||||
name: Upload Behat logs
|
||||
uses: actions/upload-artifact@v2
|
||||
uses: actions/upload-artifact@v3
|
||||
if: failure()
|
||||
with:
|
||||
name: "Behat logs (JS, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }})"
|
||||
|
|
@ -1233,8 +1225,8 @@ jobs:
|
|||
id: process-data
|
||||
shell: bash
|
||||
run: |
|
||||
echo "::set-output name=branch::$(echo ${{ github.ref }} | sed 's/refs\/heads\///g' | sed 's/refs\/tags\///g')"
|
||||
echo "::set-output name=sha::$(echo ${{ github.sha }} | cut -c 1-12)"
|
||||
echo "branch=$(echo ${{ github.ref }} | sed 's/refs\/heads\///g' | sed 's/refs\/tags\///g')" >> $GITHUB_OUTPUT
|
||||
echo "sha=$(echo ${{ github.sha }} | cut -c 1-12)" >> $GITHUB_OUTPUT
|
||||
|
||||
-
|
||||
name: "Notify on Slack"
|
||||
|
|
|
|||
2
.github/workflows/auto-merge.yml
vendored
2
.github/workflows/auto-merge.yml
vendored
|
|
@ -7,7 +7,7 @@ jobs:
|
|||
auto-merge:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v3
|
||||
|
||||
-
|
||||
name: Auto-merge minor dependencies upgrades
|
||||
|
|
|
|||
6
.github/workflows/documentation.yml
vendored
6
.github/workflows/documentation.yml
vendored
|
|
@ -26,7 +26,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
-
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
|
||||
-
|
||||
name: Install documentation dependencies
|
||||
|
|
@ -53,8 +53,8 @@ jobs:
|
|||
id: process-data
|
||||
shell: bash
|
||||
run: |
|
||||
echo "::set-output name=branch::$(echo ${{ github.ref }} | sed 's/refs\/heads\///g' | sed 's/refs\/tags\///g')"
|
||||
echo "::set-output name=sha::$(echo ${{ github.sha }} | cut -c 1-12)"
|
||||
echo "branch=$(echo ${{ github.ref }} | sed 's/refs\/heads\///g' | sed 's/refs\/tags\///g')" >> $GITHUB_OUTPUT
|
||||
echo "sha=$(echo ${{ github.sha }} | cut -c 1-12)" >> $GITHUB_OUTPUT
|
||||
|
||||
-
|
||||
name: "Notify on Slack"
|
||||
|
|
|
|||
18
.github/workflows/packages.yml
vendored
18
.github/workflows/packages.yml
vendored
|
|
@ -28,12 +28,12 @@ jobs:
|
|||
|
||||
steps:
|
||||
-
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
|
||||
-
|
||||
name: "Provide the list"
|
||||
id: create-list
|
||||
run: echo "::set-output name=packages::$(find src/Sylius -mindepth 3 -maxdepth 3 -type f -name composer.json -exec dirname '{}' \; | sed -e 's/src\/Sylius\///g' | sort | jq --raw-input . | jq --slurp . | jq -c .)"
|
||||
run: echo "packages=$(find src/Sylius -mindepth 3 -maxdepth 3 -type f -name composer.json -exec dirname '{}' \; | sed -e 's/src\/Sylius\///g' | sort | jq --raw-input . | jq --slurp . | jq -c .)" >> $GITHUB_OUTPUT
|
||||
|
||||
outputs:
|
||||
packages: "${{ steps.create-list.outputs.packages }}"
|
||||
|
|
@ -78,7 +78,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
-
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
|
||||
-
|
||||
name: Setup PHP
|
||||
|
|
@ -90,11 +90,11 @@ jobs:
|
|||
-
|
||||
name: Get Composer cache directory
|
||||
id: composer-cache
|
||||
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
|
||||
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
|
||||
|
||||
-
|
||||
name: Cache Composer
|
||||
uses: actions/cache@v2
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: ${{ steps.composer-cache.outputs.dir }}
|
||||
key: ${{ runner.os }}-php-${{ matrix.php }}-package-${{ matrix.package }}-composer-${{ hashFiles(format('src/Sylius/{0}/composer.json', matrix.package)) }}
|
||||
|
|
@ -168,14 +168,14 @@ jobs:
|
|||
-
|
||||
name: Check the existence of phpunit.xml.dist
|
||||
id: phpunit_xml_dist_existence_check
|
||||
uses: andstor/file-existence-action@v1
|
||||
uses: andstor/file-existence-action@v2
|
||||
with:
|
||||
files: "src/Sylius/${{ matrix.package }}/phpunit.xml.dist"
|
||||
|
||||
-
|
||||
name: Check the existence of phpunit.xml
|
||||
id: phpunit_xml_existence_check
|
||||
uses: andstor/file-existence-action@v1
|
||||
uses: andstor/file-existence-action@v2
|
||||
with:
|
||||
files: "src/Sylius/${{ matrix.package }}/phpunit.xml"
|
||||
|
||||
|
|
@ -202,8 +202,8 @@ jobs:
|
|||
id: process-data
|
||||
shell: bash
|
||||
run: |
|
||||
echo "::set-output name=branch::$(echo ${{ github.ref }} | sed 's/refs\/heads\///g' | sed 's/refs\/tags\///g')"
|
||||
echo "::set-output name=sha::$(echo ${{ github.sha }} | cut -c 1-12)"
|
||||
echo "branch=$(echo ${{ github.ref }} | sed 's/refs\/heads\///g' | sed 's/refs\/tags\///g')" >> $GITHUB_OUTPUT
|
||||
echo "sha=$(echo ${{ github.sha }} | cut -c 1-12)" >> $GITHUB_OUTPUT
|
||||
|
||||
-
|
||||
name: "Notify on Slack"
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ jobs:
|
|||
|
||||
- name: Get current date
|
||||
id: date
|
||||
run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
|
||||
run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Tweet about new release
|
||||
uses: Eomm/why-don-t-you-tweet@v1
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue