Skip to content

Commit

Permalink
Merge branch '5.1-dev' into activate_send_email
Browse files Browse the repository at this point in the history
  • Loading branch information
Hackwar committed Mar 29, 2024
2 parents 3edd0e6 + fc8e475 commit 6f8fe41
Show file tree
Hide file tree
Showing 3,766 changed files with 116,611 additions and 85,847 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
10 changes: 6 additions & 4 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ clone_folder: C:\projects\joomla-cms
environment:
PHPBuild: "x64"
matrix:
- php_ver_target: 8.0
- php_ver_target: 8.1


init:
- SET PATH=C:\Tools\php;%PATH%
Expand Down Expand Up @@ -40,22 +41,23 @@ install:
- choco install composer
- cd C:\projects\joomla-cms
- refreshenv
- composer install --no-progress --profile --ignore-platform-req=ext-sodium
- echo "TODO Ignore platform reqs till all composer dependencies are compatible with php 8.1"
- composer install --no-progress --profile --ignore-platform-req=ext-sodium --ignore-platform-reqs

hosts:
openldap: 127.0.0.1

services:
- mysql
- iis

before_test:
# Run openldap docker image
- ps: docker pull bitnami/openldap:2.6.3
- ps: docker run --rm --name openldap --publish 1389:1389 --publish 1636:1636 -v ${pwd}\tests\certs:/certificates --env LDAP_ADMIN_USERNAME=admin --env LDAP_ADMIN_PASSWORD=adminpassword --env LDAP_USERS=customuser --env LDAP_PASSWORDS=custompassword --env LDAP_ENABLE_TLS=yes --env LDAP_TLS_CERT_FILE=/certificates/openldap.crt --env LDAP_TLS_KEY_FILE=/certificates/openldap.key --env LDAP_TLS_CA_FILE=/certificates/CA.crt --env BITNAMI_DEBUG=true --env LDAP_CONFIG_ADMIN_ENABLED=yes --env LDAP_CONFIG_ADMIN_USERNAME=admin --env LDAP_CONFIG_ADMIN_PASSWORD=configpassword -d bitnami/openldap:2.6.3
# Database setup for MySQL via PowerShell tools
- ps: Start-Service MySQL80
- >
"C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql" -u root -p"Password12!" -e "CREATE DATABASE IF NOT EXISTS test_joomla;"
"C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql" -u root -p"Password12!" -e "CREATE DATABASE IF NOT EXISTS test_joomla;"
# Wait till slapd has started
- ps: |
$Counter=0
Expand Down

0 comments on commit 6f8fe41

Please sign in to comment.