Skip to content

Commit e6564db

Browse files
committed
Disable Phalcon Devtools for PHP 7.4 as it breaks
1 parent b90a134 commit e6564db

File tree

3 files changed

+2
-16
lines changed

3 files changed

+2
-16
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
- Fixed installation of NodeJS
1616
- Fixed installation of PostgreSQL client for PHP 5.6
1717
- Fixed installation of PostgreSQL client for PHP 7.0
18+
- Disabled Phalcon Devtools for PHP 7.4 as it breaks
1819

1920

2021
## Release 0.141

Dockerfiles/work/Dockerfile-7.4

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -328,20 +328,6 @@ fi \
328328
&& rm -rf /usr/local/src/mysqldump-secure \
329329
\
330330
\
331-
# -------------------- phalcon --------------------
332-
&& git clone https://github.com/phalcon/phalcon-devtools /usr/local/src/phalcon-devtools \
333-
&& cd /usr/local/src/phalcon-devtools \
334-
&& git checkout $(git describe --abbrev=0 --tags) \
335-
&& COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer install \
336-
\
337-
&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/phalcon-devtools \
338-
&& su - ${MY_USER} -c 'cd /usr/local/src/phalcon-devtools && ./phalcon.sh' \
339-
&& ln -sf /usr/local/src/phalcon-devtools/phalcon /usr/local/bin/phalcon \
340-
&& chmod +x phalcon \
341-
&& cd / \
342-
&& rm -rf /usr/local/src/phalcon-devtools/.git \
343-
\
344-
\
345331
# -------------------- phpcs --------------------
346332
&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs \
347333
&& chmod +x /usr/local/bin/phpcs \
@@ -780,7 +766,6 @@ fi \
780766
&& laravel --version | grep -E '(Installer|version)\s*[0-9][.0-9]+' \
781767
&& linkcheck --version | grep -E '^linkcheck\sv[0-9][.0-9]+' \
782768
&& mysqldump-secure --version | grep -E 'Version:\s*[0-9][.0-9]+' \
783-
&& phalcon commands | grep -E '[0-9][.0-9]+' \
784769
&& phpcs --version | grep -E 'version [0-9][.0-9]+' \
785770
&& phpcbf --version | grep -E 'version [0-9][.0-9]+' \
786771
&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \

build/ansible/group_vars/all/work.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1128,7 +1128,7 @@ software_available:
11281128
&& cd / \
11291129
&& rm -rf /usr/local/src/mysqldump-secure \
11301130
phalcon:
1131-
disabled: [5.2, 8.0, 8.1, 8.2]
1131+
disabled: [5.2, 7.4, 8.0, 8.1, 8.2]
11321132
check: phalcon commands | grep -E '[0-9][.0-9]+'
11331133
5.3:
11341134
pre: |

0 commit comments

Comments
 (0)