diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4fe7c4c..38e6684 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: with: go-version: '>=1.9' - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Build GearBox binaries run: | mkdir -p dist diff --git a/CHANGELOG.md b/CHANGELOG.md index cf84bed..4a1122d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,27 @@ CHANGELOG ========= +## v0.12.0 + +- Add PHP sqlite3 support + +## v0.11.5 + +- Update sqlsrv max version for PHP8.0 + +## v0.11.4 + +- Update composer install script + - Add command `composer22` (composer `v2.2.x`) for PHP < `7.2.5` + +## v0.11.3 + +- Update composer install script (get checksum from remote URL) + +## v0.11.2 + +- Update composer install script + ## v0.11.1 - Update installed package versions diff --git a/ansible/playbooks/ubuntu/11-php.yml b/ansible/playbooks/ubuntu/11-php.yml index ef2ef84..5abb50c 100644 --- a/ansible/playbooks/ubuntu/11-php.yml +++ b/ansible/playbooks/ubuntu/11-php.yml @@ -60,7 +60,7 @@ '7.2': { name: 'sqlsrv-5.8.1', dir: '/usr/lib/php/20170718' } '7.3': { name: 'sqlsrv-5.9.0', dir: '/usr/lib/php/20180731' } '7.4': { name: 'sqlsrv-5.10.1', dir: '/usr/lib/php/20190902' } - '8.0': { name: 'sqlsrv', dir: '/usr/lib/php/20200930' } + '8.0': { name: 'sqlsrv-5.11.1', dir: '/usr/lib/php/20200930' } '8.1': { name: 'sqlsrv', dir: '/usr/lib/php/20210902' } '8.2': { name: 'sqlsrv', dir: '/usr/lib/php/20220829' } tasks: @@ -105,16 +105,37 @@ - name: Install Composer shell: | + EXPECTED_CHECKSUM="$(php -r 'copy("https://composer.github.io/installer.sig", "php://stdout");')" php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" - php -r "if (hash_file('sha384', 'composer-setup.php') === '55ce33d7678c5a611085589f1f3ddf8b3c52d662cd01d4ba75c0ee0459970c2200a51f492d557530c71c15d8dba01eae') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" - php composer-setup.php - php -r "unlink('composer-setup.php');" + ACTUAL_CHECKSUM="$(php -r "echo hash_file('sha384', 'composer-setup.php');")" + + if [ "$EXPECTED_CHECKSUM" != "$ACTUAL_CHECKSUM" ] + then + >&2 echo 'ERROR: Invalid installer checksum' + rm composer-setup.php + exit 1 + fi + + php composer-setup.php --quiet + rm composer-setup.php mv composer.phar /usr/local/bin/composer args: creates: /usr/local/bin/composer when: not composer_stat_result.stat.exists + - name: 'Check composer22 is installed' + stat: + path: '/usr/local/bin/composer22' + register: composer22_stat_result + + - name: Install Composer 2.2.x for PHP < 7.2.5 + get_url: + url: https://getcomposer.org/download/latest-2.2.x/composer.phar + dest: /usr/local/bin/composer22 + mode: '+x' + when: not composer22_stat_result.stat.exists + - name: Install Blackfire Agent and PHP extensions hosts: localhost become: true diff --git a/ansible/playbooks/ubuntu/tasks/php.yml b/ansible/playbooks/ubuntu/tasks/php.yml index 5970b79..cf779de 100644 --- a/ansible/playbooks/ubuntu/tasks/php.yml +++ b/ansible/playbooks/ubuntu/tasks/php.yml @@ -26,6 +26,7 @@ - 'php{{ php_version }}-mysql' - 'php{{ php_version }}-odbc' - 'php{{ php_version }}-pgsql' + - 'php{{ php_version }}-sqlite3' - 'php{{ php_version }}-redis' - 'php{{ php_version }}-snmp' - 'php{{ php_version }}-soap' diff --git a/version/latest b/version/latest index a5de145..3061e9e 100644 --- a/version/latest +++ b/version/latest @@ -1 +1 @@ -v0.11.1 \ No newline at end of file +v0.12.0 \ No newline at end of file