mirror of
				https://github.com/shivammathur/setup-php.git
				synced 2025-10-31 15:26:23 +07:00 
			
		
		
		
	Fix logs of blackfire setup
This commit is contained in:
		
							
								
								
									
										7
									
								
								dist/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								dist/index.js
									
									
									
									
										vendored
									
									
								
							| @ -1480,6 +1480,13 @@ exports.setFailed = setFailed; | |||||||
| //----------------------------------------------------------------------- | //----------------------------------------------------------------------- | ||||||
| // Logging Commands | // Logging Commands | ||||||
| //----------------------------------------------------------------------- | //----------------------------------------------------------------------- | ||||||
|  | /** | ||||||
|  |  * Gets whether Actions Step Debug is on or not | ||||||
|  |  */ | ||||||
|  | function isDebug() { | ||||||
|  |     return process.env['RUNNER_DEBUG'] === '1'; | ||||||
|  | } | ||||||
|  | exports.isDebug = isDebug; | ||||||
| /** | /** | ||||||
|  * Writes debug message to user log |  * Writes debug message to user log | ||||||
|  * @param message debug message |  * @param message debug message | ||||||
|  | |||||||
							
								
								
									
										40
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										40
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							| @ -5,9 +5,9 @@ | |||||||
|   "requires": true, |   "requires": true, | ||||||
|   "dependencies": { |   "dependencies": { | ||||||
|     "@actions/core": { |     "@actions/core": { | ||||||
|       "version": "1.2.2", |       "version": "1.2.3", | ||||||
|       "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.2.tgz", |       "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.3.tgz", | ||||||
|       "integrity": "sha512-IbCx7oefq+Gi6FWbSs2Fnw8VkEI6Y4gvjrYprY3RV//ksq/KPMlClOerJ4jRosyal6zkUIc8R9fS/cpRMlGClg==" |       "integrity": "sha512-Wp4xnyokakM45Uuj4WLUxdsa8fJjKVl1fDTsPbTEcTcuu0Nb26IPQbOtjmnfaCPGcaoPOOqId8H9NapZ8gii4w==" | ||||||
|     }, |     }, | ||||||
|     "@actions/exec": { |     "@actions/exec": { | ||||||
|       "version": "1.0.3", |       "version": "1.0.3", | ||||||
| @ -774,9 +774,9 @@ | |||||||
|       "dev": true |       "dev": true | ||||||
|     }, |     }, | ||||||
|     "acorn": { |     "acorn": { | ||||||
|       "version": "7.1.0", |       "version": "7.1.1", | ||||||
|       "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz", |       "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz", | ||||||
|       "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==", |       "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==", | ||||||
|       "dev": true |       "dev": true | ||||||
|     }, |     }, | ||||||
|     "acorn-globals": { |     "acorn-globals": { | ||||||
| @ -822,12 +822,20 @@ | |||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "ansi-escapes": { |     "ansi-escapes": { | ||||||
|       "version": "4.3.0", |       "version": "4.3.1", | ||||||
|       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.0.tgz", |       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", | ||||||
|       "integrity": "sha512-EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg==", |       "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", | ||||||
|       "dev": true, |       "dev": true, | ||||||
|       "requires": { |       "requires": { | ||||||
|         "type-fest": "^0.8.1" |         "type-fest": "^0.11.0" | ||||||
|  |       }, | ||||||
|  |       "dependencies": { | ||||||
|  |         "type-fest": { | ||||||
|  |           "version": "0.11.0", | ||||||
|  |           "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", | ||||||
|  |           "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==", | ||||||
|  |           "dev": true | ||||||
|  |         } | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "ansi-regex": { |     "ansi-regex": { | ||||||
| @ -1875,9 +1883,9 @@ | |||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "eslint-plugin-jest": { |     "eslint-plugin-jest": { | ||||||
|       "version": "23.8.0", |       "version": "23.8.1", | ||||||
|       "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-23.8.0.tgz", |       "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-23.8.1.tgz", | ||||||
|       "integrity": "sha512-DKXmLxguZ1Lru4u5YM12ko3WLq6gqo7dhV2b63K731+/PNyZ/Ff6NGONQsGUtPLG9zU3kdz/N+2LTbweNZifeg==", |       "integrity": "sha512-OycLNqPo/2EfO6kTqnmsu1khz1gTIOxGl3ThIVwL5/oycDF4pm5uNDyvFelNLdpr4COUuM8PVi3963NEG1Efpw==", | ||||||
|       "dev": true, |       "dev": true, | ||||||
|       "requires": { |       "requires": { | ||||||
|         "@typescript-eslint/experimental-utils": "^2.5.0" |         "@typescript-eslint/experimental-utils": "^2.5.0" | ||||||
| @ -2498,9 +2506,9 @@ | |||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "hosted-git-info": { |     "hosted-git-info": { | ||||||
|       "version": "2.8.7", |       "version": "2.8.8", | ||||||
|       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.7.tgz", |       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz", | ||||||
|       "integrity": "sha512-ChkjQtKJ3GI6SsI4O5jwr8q8EPrWCnxuc4Tbx+vRI5x6mDOpjKKltNo1lRlszw3xwgTOSns1ZRBiMmmwpcvLxg==", |       "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==", | ||||||
|       "dev": true |       "dev": true | ||||||
|     }, |     }, | ||||||
|     "html-encoding-sniffer": { |     "html-encoding-sniffer": { | ||||||
|  | |||||||
| @ -24,7 +24,7 @@ | |||||||
|   "author": "shivammathur", |   "author": "shivammathur", | ||||||
|   "license": "MIT", |   "license": "MIT", | ||||||
|   "dependencies": { |   "dependencies": { | ||||||
|     "@actions/core": "^1.2.2", |     "@actions/core": "^1.2.3", | ||||||
|     "@actions/exec": "^1.0.3", |     "@actions/exec": "^1.0.3", | ||||||
|     "@actions/io": "^1.0.2", |     "@actions/io": "^1.0.2", | ||||||
|     "fs": "0.0.1-security" |     "fs": "0.0.1-security" | ||||||
| @ -38,7 +38,7 @@ | |||||||
|     "eslint": "^6.8.0", |     "eslint": "^6.8.0", | ||||||
|     "eslint-config-prettier": "^6.10.0", |     "eslint-config-prettier": "^6.10.0", | ||||||
|     "eslint-plugin-import": "^2.20.1", |     "eslint-plugin-import": "^2.20.1", | ||||||
|     "eslint-plugin-jest": "^23.8.0", |     "eslint-plugin-jest": "^23.8.1", | ||||||
|     "eslint-plugin-prettier": "^3.1.2", |     "eslint-plugin-prettier": "^3.1.2", | ||||||
|     "husky": "^4.2.3", |     "husky": "^4.2.3", | ||||||
|     "jest": "^25.1.0", |     "jest": "^25.1.0", | ||||||
|  | |||||||
| @ -141,7 +141,8 @@ add_blackfire() { | |||||||
|   sudo blackfire-agent --register --server-id="$BLACKFIRE_SERVER_ID" --server-token="$BLACKFIRE_SERVER_TOKEN" >/dev/null 2>&1 |   sudo blackfire-agent --register --server-id="$BLACKFIRE_SERVER_ID" --server-token="$BLACKFIRE_SERVER_TOKEN" >/dev/null 2>&1 | ||||||
|   brew services start blackfire-agent >/dev/null 2>&1 |   brew services start blackfire-agent >/dev/null 2>&1 | ||||||
|   sudo blackfire --config --client-id="$BLACKFIRE_CLIENT_ID" --client-token="$BLACKFIRE_CLIENT_TOKEN" >/dev/null 2>&1 |   sudo blackfire --config --client-id="$BLACKFIRE_CLIENT_ID" --client-token="$BLACKFIRE_CLIENT_TOKEN" >/dev/null 2>&1 | ||||||
|  |   add_log "$tick" "blackfire" "Added" | ||||||
|  |   add_log "$tick" "blackfire-agent" "Added" | ||||||
| } | } | ||||||
|  |  | ||||||
| # Function to configure PECL | # Function to configure PECL | ||||||
|  | |||||||
| @ -204,6 +204,8 @@ add_blackfire() { | |||||||
|   sudo blackfire-agent --register --server-id="$BLACKFIRE_SERVER_ID" --server-token="$BLACKFIRE_SERVER_TOKEN" >/dev/null 2>&1 |   sudo blackfire-agent --register --server-id="$BLACKFIRE_SERVER_ID" --server-token="$BLACKFIRE_SERVER_TOKEN" >/dev/null 2>&1 | ||||||
|   sudo /etc/init.d/blackfire-agent restart >/dev/null 2>&1 |   sudo /etc/init.d/blackfire-agent restart >/dev/null 2>&1 | ||||||
|   sudo blackfire --config --client-id="$BLACKFIRE_CLIENT_ID" --client-token="$BLACKFIRE_CLIENT_TOKEN" >/dev/null 2>&1 |   sudo blackfire --config --client-id="$BLACKFIRE_CLIENT_ID" --client-token="$BLACKFIRE_CLIENT_TOKEN" >/dev/null 2>&1 | ||||||
|  |   add_log "$tick" "blackfire" "Added" | ||||||
|  |   add_log "$tick" "blackfire-agent" "Added" | ||||||
| } | } | ||||||
|  |  | ||||||
| # Function to setup the nightly build from master branch | # Function to setup the nightly build from master branch | ||||||
|  | |||||||
| @ -185,6 +185,8 @@ Function Add-Blackfire() { | |||||||
|   if ((Test-Path env:BLACKFIRE_CLIENT_ID) -and (Test-Path env:BLACKFIRE_CLIENT_TOKEN)) { |   if ((Test-Path env:BLACKFIRE_CLIENT_ID) -and (Test-Path env:BLACKFIRE_CLIENT_TOKEN)) { | ||||||
|     blackfire --config --client-id=$env:BLACKFIRE_CLIENT_ID --client-token=$env:BLACKFIRE_CLIENT_TOKEN --ca-cert=$php_dir\ssl\cacert.pem >$null 2>&1 |     blackfire --config --client-id=$env:BLACKFIRE_CLIENT_ID --client-token=$env:BLACKFIRE_CLIENT_TOKEN --ca-cert=$php_dir\ssl\cacert.pem >$null 2>&1 | ||||||
|   } |   } | ||||||
|  |   Add-Log $tick "blackfire" "Added" | ||||||
|  |   Add-Log $tick "blackfire-agent" "Added" | ||||||
| } | } | ||||||
|  |  | ||||||
| # Variables | # Variables | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user
	 Shivam Mathur
					Shivam Mathur