Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/magento_platform_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -341,8 +341,8 @@ jobs:
- name: Setup PHP for phar build (Use a consistent, modern PHP version)
uses: shivammathur/setup-php@v2
with:
tools: composer:v2
php-version: "8.2"
tools: composer:${{ matrix.composer-version }}
php-version: ${{ matrix.php-version }}
extensions: >-
bcmath, ctype, curl, dom, gd, hash, iconv, intl, mbstring, pdo_mysql,
simplexml, soap, sodium, xml, zip, sockets
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
tools: composer:2
php-version: '8.3'
tools: composer:2.2.17
php-version: '8.2'

- name: Get Composer Cache Directory
id: composer-cache
Expand Down
12 changes: 0 additions & 12 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,6 @@ function download_box() {
fi
}

function download_composer() {
if command -v composer &>/dev/null; then
true; # do nothing
else
echo "Composer was not found. Try to install it ..."
# install composer
$PHP_BIN -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
$PHP_BIN composer-setup.php --install-dir=/usr/local/bin --filename=composer
fi
}

function find_commit_timestamp() {
LAST_COMMIT_TIMESTAMP="$(git log --format=format:%ct HEAD -1)" # reproducible build
}
Expand Down Expand Up @@ -111,7 +100,6 @@ function print_info_before_build() {
check_dependencies
system_setup
download_box
download_composer
find_commit_timestamp
print_info_before_build
create_new_phar
Expand Down