From a85c36b15e15466839bd40f668d67b233ded20b6 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 7 May 2024 21:21:10 +0200 Subject: [PATCH 1/3] [ticket/17310] Update workflow actions to v4 PHPBB3-17310 --- .github/workflows/tests.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c8c597c01df..8f241abac7b 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-20.04 + runs-on: ubuntu-22.04 strategy: matrix: include: @@ -29,7 +29,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 100 @@ -51,7 +51,7 @@ jobs: cd .. - name: Cache Composer dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: composer-${{ steps.composer-cache.outputs.version }}-${{ hashFiles('phpBB/composer.lock') }} @@ -88,7 +88,7 @@ jobs: # Tests for MySQL and MariaDB mysql-tests: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: include: @@ -157,7 +157,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - id: database-type env: @@ -184,7 +184,7 @@ jobs: cd .. - name: Cache Composer dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: composer-${{ steps.composer-cache.outputs.version }}-${{ hashFiles('phpBB/composer.lock') }} @@ -229,7 +229,7 @@ jobs: # Tests for PostgreSQL postgres-tests: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: include: @@ -292,7 +292,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - id: database-type env: @@ -319,7 +319,7 @@ jobs: cd .. - name: Cache Composer dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: composer-${{ steps.composer-cache.outputs.version }}-${{ hashFiles('phpBB/composer.lock') }} @@ -347,7 +347,7 @@ jobs: # Other database types, namely sqlite3 and mssql other-tests: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: include: @@ -390,7 +390,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - id: database-type env: @@ -422,7 +422,7 @@ jobs: cd .. - name: Cache Composer dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: composer-${{ steps.composer-cache.outputs.version }}-${{ hashFiles('phpBB/composer.lock') }} @@ -493,7 +493,7 @@ jobs: git config --system core.autocrlf false git config --system core.eol lf - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -513,7 +513,7 @@ jobs: cd .. - name: Cache Composer dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: composer-${{ steps.composer-cache.outputs.version }}-${{ hashFiles('phpBB/composer.lock') }} From 843cb97048f683e2108ccb2b817f40e2c7b19096 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 9 Sep 2023 08:47:26 +0200 Subject: [PATCH 2/3] [ticket/17176] Use ldapuri instead of removed ldaphost PHPBB3-17176 --- .github/setup-ldap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/setup-ldap.sh b/.github/setup-ldap.sh index d554654e870..d97ed9ad9d7 100755 --- a/.github/setup-ldap.sh +++ b/.github/setup-ldap.sh @@ -16,4 +16,4 @@ mkdir /var/tmp/slapd cp .github/ldap/slapd.conf /var/tmp/slapd/slapd.conf slapd -d 256 -d 128 -f /var/tmp/slapd/slapd.conf -h ldap://localhost:3389 & sleep 3 -ldapadd -h localhost:3389 -D "cn=admin,dc=example,dc=com" -w adminadmin -f .github/ldap/base.ldif +ldapadd -H localhost:3389 -D "cn=admin,dc=example,dc=com" -w adminadmin -f .github/ldap/base.ldif From d318768634c5d30eb0fe2fb140935315872b7793 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 9 Sep 2023 09:31:33 +0200 Subject: [PATCH 3/3] [ticket/17176] Use correct ldap URI PHPBB3-17176 --- .github/setup-ldap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/setup-ldap.sh b/.github/setup-ldap.sh index d97ed9ad9d7..226c625ee10 100755 --- a/.github/setup-ldap.sh +++ b/.github/setup-ldap.sh @@ -16,4 +16,4 @@ mkdir /var/tmp/slapd cp .github/ldap/slapd.conf /var/tmp/slapd/slapd.conf slapd -d 256 -d 128 -f /var/tmp/slapd/slapd.conf -h ldap://localhost:3389 & sleep 3 -ldapadd -H localhost:3389 -D "cn=admin,dc=example,dc=com" -w adminadmin -f .github/ldap/base.ldif +ldapadd -H ldap://localhost:3389 -D "cn=admin,dc=example,dc=com" -w adminadmin -f .github/ldap/base.ldif