From 43ef31b087275d3e0729f98928c77c2b43abd2cf Mon Sep 17 00:00:00 2001 From: Jan Goralski Date: Fri, 28 Oct 2022 10:06:03 +0200 Subject: [PATCH 1/3] [CI] Remove deprecations --- .github/workflows/application.yml | 24 +++++++++---------- .github/workflows/documentation.yml | 12 +++++----- .github/workflows/packages.yml | 8 +++---- .../workflows/social-media-notifications.yaml | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/application.yml b/.github/workflows/application.yml index 565e99f88f..3e8d0cfd8c 100644 --- a/.github/workflows/application.yml +++ b/.github/workflows/application.yml @@ -34,7 +34,7 @@ jobs: php: ["8.0", "8.1"] symfony: ["^4.4", "^5.4"] api-platform: ["^2.7"] - + include: - php: "8.1" symfony: "^5.4" @@ -74,7 +74,7 @@ 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 - @@ -188,7 +188,7 @@ jobs: php: ["8.0", "8.1"] symfony: ["^4.4", "^5.4"] api-platform: ["^2.7"] - + include: - php: "8.1" symfony: "^5.4" @@ -220,7 +220,7 @@ 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 @@ -282,7 +282,7 @@ 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 @@ -367,7 +367,7 @@ 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 @@ -462,7 +462,7 @@ jobs: api-platform: ["^2.7"] node: ["14.x"] mysql: ["5.7", "8.0"] - + include: - php: "8.1" symfony: "^5.4" @@ -515,7 +515,7 @@ 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 @@ -654,7 +654,7 @@ 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 @@ -678,7 +678,7 @@ jobs: - 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 @@ -763,8 +763,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" diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 49d47d7b5d..02bb7b2765 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -19,11 +19,11 @@ on: jobs: test: runs-on: ubuntu-latest - + name: "Build" timeout-minutes: 10 - + steps: - uses: actions/checkout@v2 @@ -48,15 +48,15 @@ jobs: timeout-minutes: 5 steps: - - + - name: "Process data" 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" uses: edge/simple-slack-notify@master env: diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index a8f8e09f43..a7863a068e 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -33,7 +33,7 @@ jobs: - 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 }}" @@ -68,7 +68,7 @@ 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 @@ -156,8 +156,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" diff --git a/.github/workflows/social-media-notifications.yaml b/.github/workflows/social-media-notifications.yaml index eb9ca85742..0e6f27e157 100644 --- a/.github/workflows/social-media-notifications.yaml +++ b/.github/workflows/social-media-notifications.yaml @@ -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 From 40714fed7d8bf7c3d5c83a866ee56faf3eacdc23 Mon Sep 17 00:00:00 2001 From: Jan Goralski Date: Fri, 28 Oct 2022 14:46:55 +0200 Subject: [PATCH 2/3] [CI] Update images --- .github/workflows/application.yml | 42 ++++++++++++++--------------- .github/workflows/auto-merge.yml | 2 +- .github/workflows/documentation.yml | 2 +- .github/workflows/packages.yml | 10 +++---- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/application.yml b/.github/workflows/application.yml index 3e8d0cfd8c..5f14a544c0 100644 --- a/.github/workflows/application.yml +++ b/.github/workflows/application.yml @@ -42,11 +42,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 - @@ -79,7 +79,7 @@ jobs: - 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') }} @@ -88,7 +88,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 @@ -96,7 +96,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 @@ -167,7 +167,7 @@ jobs: steps: - - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Run PHPArkitect @@ -195,7 +195,7 @@ jobs: api-platform: "~2.6.0" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -223,7 +223,7 @@ jobs: 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') }} @@ -252,7 +252,7 @@ jobs: steps: - - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Shutdown default MySQL run: sudo service mysql stop @@ -286,7 +286,7 @@ jobs: - 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') }} @@ -337,7 +337,7 @@ jobs: steps: - - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Shutdown default MySQL run: sudo service mysql stop @@ -371,7 +371,7 @@ jobs: - 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') }} @@ -439,7 +439,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 }})" @@ -476,7 +476,7 @@ jobs: steps: - - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Shutdown default MySQL @@ -519,7 +519,7 @@ jobs: - 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') }} @@ -584,7 +584,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 }})" @@ -612,7 +612,7 @@ jobs: steps: - - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Shutdown default MySQL @@ -658,7 +658,7 @@ jobs: - 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') }} @@ -671,7 +671,7 @@ jobs: - name: Setup Node - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: "${{ matrix.node }}" @@ -682,7 +682,7 @@ jobs: - 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') }} @@ -739,7 +739,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 }})" diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 8dfc6091d4..d98fa6c652 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -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 diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 02bb7b2765..beaa5a1cd6 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -26,7 +26,7 @@ jobs: steps: - - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Install documentation dependencies diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index a7863a068e..0a64879ca0 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -28,7 +28,7 @@ jobs: steps: - - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: "Provide the list" @@ -56,7 +56,7 @@ jobs: steps: - - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup PHP @@ -72,7 +72,7 @@ jobs: - 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)) }} @@ -122,14 +122,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" From ddd3ce35ce1424cdd986be01f6f02142d83be3ac Mon Sep 17 00:00:00 2001 From: Jan Goralski Date: Fri, 28 Oct 2022 16:32:01 +0200 Subject: [PATCH 3/3] [CI] Remove unused step --- .github/workflows/application.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/application.yml b/.github/workflows/application.yml index 5f14a544c0..af361104ac 100644 --- a/.github/workflows/application.yml +++ b/.github/workflows/application.yml @@ -115,14 +115,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