From 2aa3f81322504a47e6ec2ef99db333066a20ddc1 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Thu, 12 Mar 2026 09:44:55 -0700 Subject: [PATCH 1/2] Update tests to match phpBB test minimums better --- .github/workflows/tests.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e53bf41..0c04c93 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -175,7 +175,7 @@ jobs: strategy: matrix: php: ${{ fromJSON(inputs.PHP_VERSION_MATRIX) }} - db: ['mysql:8.0', 'mariadb:10.5'] + db: ['mysql:8.4', 'mysql:9.4'] include: - php: ${{ inputs.PRIMARY_PHP_VERSION }} db: 'mariadb:10.2' @@ -192,15 +192,13 @@ jobs: - php: ${{ inputs.PRIMARY_PHP_VERSION }} db: 'mariadb:10.11' - php: ${{ inputs.PRIMARY_PHP_VERSION }} - db: 'mysql:8.1' - - php: ${{ inputs.PRIMARY_PHP_VERSION }} - db: 'mysql:5.7' + db: 'mysql:8.0' db_alias: 'MyISAM Tests' MYISAM: 1 - php: ${{ startsWith(inputs.PRIMARY_PHP_VERSION, '7') && '7.4' || inputs.PRIMARY_PHP_VERSION }} - db: 'mysql:5.7' + db: 'mysql:8.0' COVERAGE: ${{ inputs.CODECOV == '1' && '1' || '0' }} - db_alias: ${{ inputs.CODECOV == '1' && 'mysql:5.7 with Coverage' || 'mysql:5.7' }} + db_alias: ${{ inputs.CODECOV == '1' && 'mysql:8.0 with Coverage' || 'mysql:8.0' }} name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }} @@ -374,10 +372,8 @@ jobs: strategy: matrix: php: ${{ fromJSON(inputs.PHP_VERSION_MATRIX) }} - db: ['postgres:15'] + db: ['postgres:9.5'] include: - - php: ${{ inputs.PRIMARY_PHP_VERSION }} - db: 'postgres:9.5' - php: ${{ inputs.PRIMARY_PHP_VERSION }} db: 'postgres:9.6' - php: ${{ inputs.PRIMARY_PHP_VERSION }} @@ -390,6 +386,8 @@ jobs: db: 'postgres:13' - php: ${{ inputs.PRIMARY_PHP_VERSION }} db: 'postgres:14' + - php: ${{ inputs.PRIMARY_PHP_VERSION }} + db: 'postgres:15' name: PHP ${{ matrix.php }} - ${{ matrix.db }} From 5bef6a14285ffc4f56eb5c1c0851341389ec6648 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Thu, 12 Mar 2026 10:05:09 -0700 Subject: [PATCH 2/2] Update test dependencies --- .github/workflows/tests.yml | 54 ++++++++++++------------ .github/workflows/validate_workflows.yml | 6 +-- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0c04c93..ce53607 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -103,14 +103,14 @@ jobs: sudo apt-get update -y --allow-releaseinfo-change - name: Checkout phpBB - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: repository: phpbb/phpbb ref: ${{ env.PHPBB_BRANCH }} path: phpBB4 - name: Checkout extension - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: path: phpBB4/phpBB/ext/${{ env.EXTNAME }} @@ -232,14 +232,14 @@ jobs: sudo apt-get update -y --allow-releaseinfo-change - name: Checkout phpBB - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: repository: phpbb/phpbb ref: ${{ env.PHPBB_BRANCH }} path: phpBB4 - name: Checkout extension - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: path: phpBB4/phpBB/ext/${{ env.EXTNAME }} @@ -275,13 +275,13 @@ jobs: - name: Set up Node.js if: ${{ inputs.RUN_NPM_INSTALL == '1' }} - uses: actions/setup-node@v4 + uses: actions/setup-node@v6 with: - node-version: 20 + node-version: 24 - name: Cache NPM dependencies if: ${{ inputs.RUN_NPM_INSTALL == '1' }} - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ./phpBB4/phpBB/ext/${{ env.EXTNAME }}/node_modules key: ${{ runner.os }}-node-${{ hashFiles('phpBB4/phpBB/ext/${{ env.EXTNAME }}/package-lock.json') }} @@ -295,7 +295,7 @@ jobs: - name: Cache Composer dependencies if: ${{ inputs.RUN_COMPOSER_INSTALL == '1' }} - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ./phpBB4/phpBB/ext/${{ env.EXTNAME }}/vendor key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('phpBB4/phpBB/ext/${{ env.EXTNAME }}/composer.lock') }} @@ -310,7 +310,7 @@ jobs: - name: Checkout test-framework if: ${{ matrix.COVERAGE == '1' }} - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: repository: phpbb-extensions/test-framework ref: ${{ env.PHPBB_BRANCH }} @@ -423,14 +423,14 @@ jobs: sudo apt-get update -y --allow-releaseinfo-change - name: Checkout phpBB - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: repository: phpbb/phpbb ref: ${{ env.PHPBB_BRANCH }} path: phpBB4 - name: Checkout extension - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: path: phpBB4/phpBB/ext/${{ env.EXTNAME }} @@ -466,13 +466,13 @@ jobs: - name: Set up Node.js if: ${{ inputs.RUN_NPM_INSTALL == '1' }} - uses: actions/setup-node@v4 + uses: actions/setup-node@v6 with: - node-version: 20 + node-version: 24 - name: Cache NPM dependencies if: ${{ inputs.RUN_NPM_INSTALL == '1' }} - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ./phpBB4/phpBB/ext/${{ env.EXTNAME }}/node_modules key: ${{ runner.os }}-node-${{ hashFiles('phpBB4/phpBB/ext/${{ env.EXTNAME }}/package-lock.json') }} @@ -486,7 +486,7 @@ jobs: - name: Cache Composer dependencies if: ${{ inputs.RUN_COMPOSER_INSTALL == '1' }} - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ./phpBB4/phpBB/ext/${{ env.EXTNAME }}/vendor key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('phpBB4/phpBB/ext/${{ env.EXTNAME }}/composer.lock') }} @@ -571,14 +571,14 @@ jobs: sudo apt-get update -y --allow-releaseinfo-change - name: Checkout phpBB - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: repository: phpbb/phpbb ref: ${{ env.PHPBB_BRANCH }} path: phpBB4 - name: Checkout extension - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: path: phpBB4/phpBB/ext/${{ env.EXTNAME }} @@ -619,13 +619,13 @@ jobs: - name: Set up Node.js if: ${{ inputs.RUN_NPM_INSTALL == '1' }} - uses: actions/setup-node@v4 + uses: actions/setup-node@v6 with: - node-version: 20 + node-version: 24 - name: Cache NPM dependencies if: ${{ inputs.RUN_NPM_INSTALL == '1' }} - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ./phpBB4/phpBB/ext/${{ env.EXTNAME }}/node_modules key: ${{ runner.os }}-node-${{ hashFiles('phpBB4/phpBB/ext/${{ env.EXTNAME }}/package-lock.json') }} @@ -639,7 +639,7 @@ jobs: - name: Cache Composer dependencies if: ${{ inputs.RUN_COMPOSER_INSTALL == '1' }} - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ./phpBB4/phpBB/ext/${{ env.EXTNAME }}/vendor key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('phpBB4/phpBB/ext/${{ env.EXTNAME }}/composer.lock') }} @@ -694,14 +694,14 @@ jobs: git config --system core.eol lf - name: Checkout phpBB - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: repository: phpbb/phpbb ref: ${{ env.PHPBB_BRANCH }} path: phpBB4 - name: Checkout extension - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: path: phpBB4/phpBB/ext/${{ env.EXTNAME }} @@ -779,13 +779,13 @@ jobs: - name: Set up Node.js if: ${{ inputs.RUN_NPM_INSTALL == '1' }} - uses: actions/setup-node@v4 + uses: actions/setup-node@v6 with: - node-version: 20 + node-version: 24 - name: Cache NPM dependencies if: ${{ inputs.RUN_NPM_INSTALL == '1' }} - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ./phpBB4/phpBB/ext/${{ env.EXTNAME }}/node_modules key: ${{ runner.os }}-node-${{ hashFiles('phpBB4/phpBB/ext/${{ env.EXTNAME }}/package-lock.json') }} @@ -799,7 +799,7 @@ jobs: - name: Cache Composer dependencies if: ${{ inputs.RUN_COMPOSER_INSTALL == '1' }} - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ./phpBB4/phpBB/ext/${{ env.EXTNAME }}/vendor key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('phpBB4/phpBB/ext/${{ env.EXTNAME }}/composer.lock') }} diff --git a/.github/workflows/validate_workflows.yml b/.github/workflows/validate_workflows.yml index 128fdeb..e90a356 100644 --- a/.github/workflows/validate_workflows.yml +++ b/.github/workflows/validate_workflows.yml @@ -17,15 +17,15 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 # Step 1: Run actionlint for logic/deprecation checks - name: Run actionlint - uses: raven-actions/actionlint@v1 + uses: raven-actions/actionlint@v2 # Step 2: Set up Python for schema validation - name: Set up Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: "3.x"