You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by rs...@apache.org on 2022/02/10 19:19:53 UTC
[avro] branch master updated: AVRO-3386: [PHP] Pin composer to a common version 2.2.5 (#1532)
This is an automated email from the ASF dual-hosted git repository.
rskraba pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/avro.git
The following commit(s) were added to refs/heads/master by this push:
new 1159549 AVRO-3386: [PHP] Pin composer to a common version 2.2.5 (#1532)
1159549 is described below
commit 11595499d6d410bf8663c365ad161e0c5d1e1358
Author: Ryan Skraba <ry...@skraba.com>
AuthorDate: Thu Feb 10 20:19:45 2022 +0100
AVRO-3386: [PHP] Pin composer to a common version 2.2.5 (#1532)
---
.github/workflows/test-lang-php.yml | 2 ++
.travis.yml | 2 +-
share/docker/Dockerfile | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/test-lang-php.yml b/.github/workflows/test-lang-php.yml
index 1fc227f..15e6619 100644
--- a/.github/workflows/test-lang-php.yml
+++ b/.github/workflows/test-lang-php.yml
@@ -46,6 +46,7 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
+ tools: composer:2.2.5
- name: Get Composer Cache Directory
id: composer-cache
@@ -81,6 +82,7 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
+ tools: composer:2.2.5
- name: Cache Local Maven Repository
uses: actions/cache@v2
diff --git a/.travis.yml b/.travis.yml
index 86ec8b3..a996701 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -204,7 +204,7 @@ matrix:
install:
- php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
- php -r "if (hash_file('sha384', 'composer-setup.php') === '906a84df04cea2aa72f40b5f787e49f22d4c2f19492ac310e8cba5b96ac8b64115ac402c8cd292b8a03482574915d1a8') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
- - php composer-setup.php
+ - php composer-setup.php --version=2.2.5
- php -r "unlink('composer-setup.php');"
- sudo mv composer.phar /usr/local/bin/composer
# remove Composer 1 pre-installed by TravisCI and use Composer 2 installed manually above
diff --git a/share/docker/Dockerfile b/share/docker/Dockerfile
index 8ff6722..6652aea 100644
--- a/share/docker/Dockerfile
+++ b/share/docker/Dockerfile
@@ -144,7 +144,7 @@ RUN mkdir tmp && cd tmp \
&& php -m \
&& apt-get -qqy clean
-RUN curl -sS https://getcomposer.org/installer | php -- --version=2.0.7 --install-dir=/usr/local/bin --filename=composer
+RUN curl -sS https://getcomposer.org/installer | php -- --version=2.2.5 --install-dir=/usr/local/bin --filename=composer
# Install Perl modules
RUN apt-get -qqy install --no-install-recommends libcompress-raw-zlib-perl \