Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'jcms/4.1-dev' into make-get-response-sa…
…ving-optional
- Loading branch information
Showing
510 changed files
with
5,532 additions
and
1,763 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,89 +1,56 @@ | ||
| image: Visual Studio 2022 | ||
| build: false | ||
| platform: | ||
| - x64 | ||
| clone_folder: C:\projects\joomla-cms | ||
|
|
||
| branches: | ||
| except: | ||
| - /l10n_*/ | ||
|
|
||
| ## Build matrix for lowest and highest possible targets | ||
| environment: | ||
| PHPBuild: "x64" | ||
| VC: "vc15" | ||
| WINCACHE: "2.0.0.8" | ||
| matrix: | ||
| - php_ver_target: 7.2 | ||
| - php_ver_target: 7.3 | ||
| - php_ver_target: 7.4 | ||
| - php_ver_target: 8.0 | ||
|
|
||
|
|
||
| init: | ||
| - SET PATH=C:\Program Files\OpenSSL;C:\tools\php;%PATH% | ||
| - SET PATH=C:\Tools\php;%PATH% | ||
| - SET COMPOSER_NO_INTERACTION=1 | ||
| - SET PHP=1 # This var relates to caching the php install | ||
| - SET ANSICON=121x90 (121x90) | ||
| services: | ||
| - mysql | ||
| - postgresql94 | ||
| - iis | ||
|
|
||
| ## Install PHP and composer, and run the appropriate composer command | ||
| install: | ||
| - IF EXIST C:\tools\php (SET PHP=0) | ||
| # @todo: This is a workaround for https://github.com/chocolatey/choco/issues/1843. Once this is fixed we | ||
| # should go back to latest version in appveyor saving ourselves test time | ||
| - ps: choco upgrade chocolatey -y --version 0.10.13 --allow-downgrade --no-progress | ||
| - ps: >- | ||
| If ($env:PHP -eq "1") { | ||
| appveyor-retry cinst --no-progress --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y php --version ((choco search php --exact --all-versions -r | select-string -pattern $env:php_ver_target | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','') | ||
| } | ||
| appveyor-retry choco install --no-progress --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y php --version ((choco search php --exact --all-versions -r | select-string -pattern $env:php_ver_target | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','') | ||
| - cd C:\tools\php | ||
| - IF %PHP%==1 copy php.ini-production php.ini /Y | ||
| - IF %PHP%==1 echo date.timezone="UTC" >> php.ini | ||
| - IF %PHP%==1 echo extension_dir=ext >> php.ini | ||
| - IF %PHP%==1 echo extension=php_openssl.dll >> php.ini | ||
| - IF %PHP%==1 echo extension=php_mbstring.dll >> php.ini | ||
| - IF %PHP%==1 echo extension=php_fileinfo.dll >> php.ini | ||
| - IF %PHP%==1 echo extension=php_gd2.dll >> php.ini | ||
| - IF %PHP%==1 echo extension=php_gmp.dll >> php.ini | ||
| - IF %PHP%==1 echo extension=php_pgsql.dll >> php.ini | ||
| - IF %PHP%==1 echo extension=php_pdo_pgsql.dll >> php.ini | ||
| - IF %PHP%==1 echo extension=php_pdo_mysql.dll >> php.ini | ||
| - IF %PHP%==1 echo extension=php_mysqli.dll >> php.ini | ||
| - IF %PHP_VER_TARGET%==5.6 IF %PHP%==1 echo extension=php_mysql.dll >> php.ini | ||
| - IF %PHP%==1 echo extension=php_curl.dll >> php.ini | ||
| # Get the Wincache DLLs | ||
| - ps: >- | ||
| If ($env:PHP -eq "1" -and $env:WINCACHE) { | ||
| cd c:\tools\php\ext | ||
| $source = "https://windows.php.net/downloads/pecl/releases/wincache/$($env:WINCACHE)/php_wincache-$($env:WINCACHE)-$($env:php_ver_target)-nts-$($env:VC)-$($env:PHPBuild).zip" | ||
| $destination = "c:\tools\php\ext\php_wincache-$($env:WINCACHE)-$($env:php_ver_target)-nts-$($env:VC)-$($env:PHPBuild).zip" | ||
| Invoke-WebRequest $source -OutFile $destination | ||
| #appveyor-retry appveyor DownloadFile https://windows.php.net/downloads/pecl/releases/wincache/$($env:WINCACHE)/php_wincache-$($env:WINCACHE)-$($env:php_ver_target)-nts-$($env:VC)-$($env:PHPBuild).zip | ||
| 7z x -y php_wincache-$($env:WINCACHE)-$($env:php_ver_target)-nts-$($env:VC)-$($env:PHPBuild).zip > $null | ||
| Remove-Item C:\tools\php\ext* -include .zip | ||
| cd c:\tools\php | ||
| Add-Content php.ini "`nextension=php_wincache.dll" | ||
| Add-Content php.ini "`wincache.enablecli = 1" | ||
| Add-Content php.ini "`n" | ||
| } | ||
| - IF %PHP%==1 echo zend_extension=php_opcache.dll >> php.ini | ||
| - IF %PHP%==1 echo opcache.enable_cli=1 >> php.ini | ||
| - IF %PHP%==1 echo extension=php_ldap.dll >> php.ini | ||
| - IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat | ||
| - IF %PHP%==1 appveyor-retry appveyor DownloadFile https://getcomposer.org/download/latest-1.x/composer.phar | ||
| - copy php.ini-production php.ini /Y | ||
| - echo date.timezone="UTC" >> php.ini | ||
| - echo extension_dir=ext >> php.ini | ||
| - echo extension=php_openssl.dll >> php.ini | ||
| - echo extension=php_mbstring.dll >> php.ini | ||
| - echo extension=php_fileinfo.dll >> php.ini | ||
| - IF %php_ver_target% LSS 8 echo extension=php_gd2.dll >> php.ini | ||
| - IF %php_ver_target% GEQ 8 echo extension=gd >> php.ini | ||
| - echo extension=php_gmp.dll >> php.ini | ||
| - echo extension=php_pgsql.dll >> php.ini | ||
| - echo extension=php_pdo_pgsql.dll >> php.ini | ||
| - echo extension=php_pdo_mysql.dll >> php.ini | ||
| - echo extension=php_mysqli.dll >> php.ini | ||
| - echo extension=php_curl.dll >> php.ini | ||
| - echo zend_extension=php_opcache.dll >> php.ini | ||
| - echo opcache.enable_cli=1 >> php.ini | ||
| - echo extension=php_ldap.dll >> php.ini | ||
| - choco install composer | ||
| - cd C:\projects\joomla-cms | ||
| - appveyor-retry composer install --no-progress --profile | ||
| - refreshenv | ||
| - composer install --no-progress --profile | ||
| before_test: | ||
| # Database setup for MySQL via PowerShell tools | ||
| - > | ||
| "C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql" -u root -p"Password12!" -e "CREATE DATABASE IF NOT EXISTS joomla_ut;" | ||
| # Database setup for PostgreSQL | ||
| - SET PGUSER=postgres | ||
| - SET PGPASSWORD=Password12! | ||
| - PATH=C:\Program Files\PostgreSQL\9.4\bin\;%PATH% | ||
| - createdb joomla_ut | ||
| "C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql" -u root -p"Password12!" -e "CREATE DATABASE IF NOT EXISTS test_joomla;" | ||
| test_script: | ||
| - cd C:\projects\joomla-cms | ||
| - libraries/vendor/bin/phpunit --testsuite Unit | ||
| - libraries/vendor/bin/phpunit --testsuite Integration --configuration tests/phpunit-appveyor.xml.dist |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
administrator/components/com_admin/sql/updates/mysql/4.1.1-2022-02-20.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| DELETE FROM `#__postinstall_messages` WHERE `title_key` = 'COM_ADMIN_POSTINSTALL_MSG_FLOC_BLOCKER_TITLE'; |
Oops, something went wrong.