From beaceb008973dfcf90ef494ce924700817e216de Mon Sep 17 00:00:00 2001 From: Shivam Mathur Date: Wed, 10 Nov 2021 05:45:18 +0530 Subject: [PATCH] Fix to only copy problem-matchers configs to RUNNER_TOOL_CACHE --- src/configs/{ => pm}/php.json | 0 src/configs/{ => pm}/phpunit.json | 0 src/scripts/darwin.sh | 2 +- src/scripts/linux.sh | 2 +- src/scripts/win32.ps1 | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename src/configs/{ => pm}/php.json (100%) rename src/configs/{ => pm}/phpunit.json (100%) diff --git a/src/configs/php.json b/src/configs/pm/php.json similarity index 100% rename from src/configs/php.json rename to src/configs/pm/php.json diff --git a/src/configs/phpunit.json b/src/configs/pm/phpunit.json similarity index 100% rename from src/configs/phpunit.json rename to src/configs/pm/phpunit.json diff --git a/src/scripts/darwin.sh b/src/scripts/darwin.sh index dd28729c..03f51a6c 100644 --- a/src/scripts/darwin.sh +++ b/src/scripts/darwin.sh @@ -226,7 +226,7 @@ setup_php() { exit 1 fi - sudo cp "$dist"/../src/configs/*.json "$RUNNER_TOOL_CACHE/" + sudo cp "$dist"/../src/configs/pm/*.json "$RUNNER_TOOL_CACHE/" echo "::set-output name=php-version::$semver" add_log "$tick" "PHP" "$status PHP $semver$extra_version" } diff --git a/src/scripts/linux.sh b/src/scripts/linux.sh index 564ac400..87a615e9 100644 --- a/src/scripts/linux.sh +++ b/src/scripts/linux.sh @@ -215,7 +215,7 @@ setup_php() { configure_php sudo rm -rf /usr/local/bin/phpunit >/dev/null 2>&1 sudo chmod 777 "${ini_file[@]}" "$pecl_file" "${tool_path_dir:?}" - sudo cp "$dist"/../src/configs/*.json "$RUNNER_TOOL_CACHE/" + sudo cp "$dist"/../src/configs/pm/*.json "$RUNNER_TOOL_CACHE/" echo "::set-output name=php-version::$semver" add_log "${tick:?}" "PHP" "$status PHP $semver$extra_version" } diff --git a/src/scripts/win32.ps1 b/src/scripts/win32.ps1 index 42c8907b..fd71c83f 100644 --- a/src/scripts/win32.ps1 +++ b/src/scripts/win32.ps1 @@ -572,7 +572,7 @@ if($version -lt "5.5") { } Enable-PhpExtension -Extension $enable_extensions -Path $php_dir Add-PhpCAInfo -Copy-Item -Path $dist\..\src\configs\*.json -Destination $env:RUNNER_TOOL_CACHE +Copy-Item -Path $dist\..\src\configs\pm\*.json -Destination $env:RUNNER_TOOL_CACHE New-Item -ItemType Directory -Path $composer_bin -Force > $null 2>&1 Write-Output "::set-output name=php-version::$($installed.FullVersion)" Add-Log $tick "PHP" "$status PHP $($installed.FullVersion)$extra_version"