From 90899a17ddb4482047c246217d34a75eb23d5af9 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 11 Dec 2022 15:10:44 +0100 Subject: [PATCH 1/3] [ticket/17066] Use version 3 of actions checkout and cache PHPBB3-17066 --- .github/workflows/tests.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e0481236fc..df59223c22 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -29,7 +29,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 100 @@ -51,7 +51,7 @@ jobs: cd .. - name: Cache Composer dependencies - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ steps.composer-cache.outputs.dir }} key: composer-${{ steps.composer-cache.outputs.version }}-${{ hashFiles('phpBB/composer.lock') }} @@ -157,7 +157,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - id: database-type env: @@ -184,7 +184,7 @@ jobs: cd .. - name: Cache Composer dependencies - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ steps.composer-cache.outputs.dir }} key: composer-${{ steps.composer-cache.outputs.version }}-${{ hashFiles('phpBB/composer.lock') }} @@ -290,7 +290,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - id: database-type env: @@ -317,7 +317,7 @@ jobs: cd .. - name: Cache Composer dependencies - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ steps.composer-cache.outputs.dir }} key: composer-${{ steps.composer-cache.outputs.version }}-${{ hashFiles('phpBB/composer.lock') }} @@ -388,7 +388,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - id: database-type env: @@ -420,7 +420,7 @@ jobs: cd .. - name: Cache Composer dependencies - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ steps.composer-cache.outputs.dir }} key: composer-${{ steps.composer-cache.outputs.version }}-${{ hashFiles('phpBB/composer.lock') }} @@ -485,7 +485,7 @@ jobs: git config --system core.autocrlf false git config --system core.eol lf - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -505,7 +505,7 @@ jobs: cd .. - name: Cache Composer dependencies - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ steps.composer-cache.outputs.dir }} key: composer-${{ steps.composer-cache.outputs.version }}-${{ hashFiles('phpBB/composer.lock') }} From 02ef7c5da4a2910bdf2c0224e2d18fec9559369f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 11 Dec 2022 15:19:02 +0100 Subject: [PATCH 2/3] [ticket/17066] Use new way of saving to github output PHPBB3-17066 --- .github/workflows/tests.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index df59223c22..7fab96b60a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -46,8 +46,8 @@ jobs: PHP_VERSION: ${{ matrix.php }} run: | cd phpBB - echo "::set-output name=dir::$(composer config cache-files-dir)" - echo "::set-output name=version::${PHP_VERSION%.*}" + echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + echo "version=${PHP_VERSION%.*}" >> $GITHUB_OUTPUT cd .. - name: Cache Composer dependencies @@ -164,7 +164,7 @@ jobs: MATRIX_DB: ${{ matrix.db }} run: | db=$(echo "${MATRIX_DB%%:*}") - echo "::set-output name=db::$db" + echo "db=$db" >> $GITHUB_OUTPUT - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -179,8 +179,8 @@ jobs: PHP_VERSION: ${{ matrix.php }} run: | cd phpBB - echo "::set-output name=dir::$(composer config cache-files-dir)" - echo "::set-output name=version::${PHP_VERSION%.*}" + echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + echo "version=${PHP_VERSION%.*}" >> $GITHUB_OUTPUT cd .. - name: Cache Composer dependencies @@ -297,7 +297,7 @@ jobs: MATRIX_DB: ${{ matrix.db }} run: | db=$(echo "${MATRIX_DB%%:*}") - echo "::set-output name=db::$db" + echo "db=$db" >> $GITHUB_OUTPUT - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -312,8 +312,8 @@ jobs: PHP_VERSION: ${{ matrix.php }} run: | cd phpBB - echo "::set-output name=dir::$(composer config cache-files-dir)" - echo "::set-output name=version::${PHP_VERSION%.*}" + echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + echo "version=${PHP_VERSION%.*}" >> $GITHUB_OUTPUT cd .. - name: Cache Composer dependencies @@ -400,7 +400,7 @@ jobs: else db=$(echo "${MATRIX_DB%%:*}") fi - echo "::set-output name=db::$db" + echo "db=$db" >> $GITHUB_OUTPUT - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -415,8 +415,8 @@ jobs: PHP_VERSION: ${{ matrix.php }} run: | cd phpBB - echo "::set-output name=dir::$(composer config cache-files-dir)" - echo "::set-output name=version::${PHP_VERSION%.*}" + echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + echo "version=${PHP_VERSION%.*}" >> $GITHUB_OUTPUT cd .. - name: Cache Composer dependencies @@ -499,9 +499,9 @@ jobs: id: composer-cache run: | cd phpBB - echo "::set-output name=dir::$(composer config cache-files-dir)" + echo "dir=$(composer config cache-files-dir)" >> $env:GITHUB_OUTPUT $major_version="${{ matrix.php }}".substring(0,1) - echo "::set-output name=version::$major_version" + echo "version=$major_version" >> $env:GITHUB_OUTPUT cd .. - name: Cache Composer dependencies From bb0f6d040cc83e0780d4aadc2587d5fa3f44171d Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 11 Dec 2022 20:43:01 +0100 Subject: [PATCH 3/3] [ticket/17066] Use Ubuntu 20.04 instead of 18.04 PHPBB3-17066 --- .github/workflows/tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7fab96b60a..6f351d036d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,7 +17,7 @@ on: jobs: # Basic checks, e.g. parse errors, commit messages, etc. basic-checks: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: matrix: include: @@ -88,7 +88,7 @@ jobs: # Tests for MySQL and MariaDB mysql-tests: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: matrix: include: @@ -229,7 +229,7 @@ jobs: # Tests for PostgreSQL postgres-tests: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: matrix: include: @@ -345,7 +345,7 @@ jobs: # Other database types, namely sqlite3 and mssql other-tests: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: matrix: include: