From 5de6285e1f22b526270d7e400152c75b40b8b3a3 Mon Sep 17 00:00:00 2001 From: Shivam Mathur Date: Tue, 25 Feb 2020 22:05:48 +0530 Subject: [PATCH] Fix composer version --- __tests__/tools.test.ts | 8 ++++---- dist/index.js | 6 ++++-- src/tools.ts | 6 ++++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/__tests__/tools.test.ts b/__tests__/tools.test.ts index 0199d50c..abf43219 100644 --- a/__tests__/tools.test.ts +++ b/__tests__/tools.test.ts @@ -372,7 +372,7 @@ describe('Tools tests', () => { 'linux' ); expect(script).toContain( - 'add_tool https://github.com/composer/composer/releases/latest/download/composer.phar composer' + 'add_tool https://getcomposer.org/composer-stable.phar composer' ); expect(script).toContain( 'add_tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/latest/download/cs2pr cs2pr' @@ -410,7 +410,7 @@ describe('Tools tests', () => { 'darwin' ); expect(script).toContain( - 'add_tool https://github.com/composer/composer/releases/latest/download/composer.phar composer' + 'add_tool https://getcomposer.org/composer-stable.phar composer' ); expect(script).toContain( 'add_tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/download/1.2.3/cs2pr cs2pr' @@ -457,7 +457,7 @@ describe('Tools tests', () => { 'win32' ); expect(script).toContain( - 'Add-Tool https://github.com/composer/composer/releases/latest/download/composer.phar composer' + 'Add-Tool https://getcomposer.org/composer-stable.phar composer' ); expect(script).toContain( 'Add-Tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/latest/download/cs2pr cs2pr' @@ -494,7 +494,7 @@ describe('Tools tests', () => { 'win32' ); expect(script).toContain( - 'Add-Tool https://github.com/composer/composer/releases/latest/download/composer.phar composer' + 'Add-Tool https://getcomposer.org/composer-stable.phar composer' ); expect(script).toContain( 'Add-Composer-Tool prestissimo prestissimo hirak/' diff --git a/dist/index.js b/dist/index.js index 92687e63..95e81ace 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2023,8 +2023,10 @@ function addTools(tools_csv, php_version, os_version) { script += yield addArchive(tool, version, url, os_version); break; case 'composer': - url = - github + 'composer/composer/releases/latest/download/composer.phar'; + // If RC is released as latest release, switch to getcomposer. + // Prefered source is GitHub as it is faster. + // url = github + 'composer/composer/releases/latest/download/composer.phar'; + url = 'https://getcomposer.org/composer-stable.phar'; script += yield addArchive(tool, version, url, os_version); break; case 'codeception': diff --git a/src/tools.ts b/src/tools.ts index 3e7e2137..522769db 100644 --- a/src/tools.ts +++ b/src/tools.ts @@ -498,8 +498,10 @@ export async function addTools( script += await addArchive(tool, version, url, os_version); break; case 'composer': - url = - github + 'composer/composer/releases/latest/download/composer.phar'; + // If RC is released as latest release, switch to getcomposer. + // Prefered source is GitHub as it is faster. + // url = github + 'composer/composer/releases/latest/download/composer.phar'; + url = 'https://getcomposer.org/composer-stable.phar'; script += await addArchive(tool, version, url, os_version); break; case 'codeception':