mirror of
				https://git.mirrors.martin98.com/https://github.com/actions/setup-python
				synced 2025-10-31 13:41:06 +08:00 
			
		
		
		
	Add warning for python 2.7 on release/v3 (#674)
* add warning * npm run format * remove ubuntu-18.04
This commit is contained in:
		
							parent
							
								
									48e4ac7062
								
							
						
					
					
						commit
						3542bca263
					
				
							
								
								
									
										2
									
								
								.github/workflows/test-pypy.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/test-pypy.yml
									
									
									
									
										vendored
									
									
								
							| @ -18,7 +18,7 @@ jobs: | |||||||
|     strategy: |     strategy: | ||||||
|       fail-fast: false |       fail-fast: false | ||||||
|       matrix: |       matrix: | ||||||
|         os: [macos-latest, windows-latest, ubuntu-18.04, ubuntu-latest] |         os: [macos-latest, windows-latest, ubuntu-latest] | ||||||
|         pypy: |         pypy: | ||||||
|         - 'pypy-2.7' |         - 'pypy-2.7' | ||||||
|         - 'pypy-3.7' |         - 'pypy-3.7' | ||||||
|  | |||||||
							
								
								
									
										6
									
								
								.github/workflows/test-python.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								.github/workflows/test-python.yml
									
									
									
									
										vendored
									
									
								
							| @ -18,7 +18,7 @@ jobs: | |||||||
|     strategy: |     strategy: | ||||||
|       fail-fast: false |       fail-fast: false | ||||||
|       matrix: |       matrix: | ||||||
|         os: [macos-latest, windows-latest, ubuntu-18.04, ubuntu-20.04] |         os: [macos-latest, windows-latest, ubuntu-20.04] | ||||||
|     steps: |     steps: | ||||||
|     - name: Checkout |     - name: Checkout | ||||||
|       uses: actions/checkout@v2 |       uses: actions/checkout@v2 | ||||||
| @ -38,7 +38,7 @@ jobs: | |||||||
|     strategy: |     strategy: | ||||||
|       fail-fast: false |       fail-fast: false | ||||||
|       matrix: |       matrix: | ||||||
|         os: [macos-latest, windows-latest, ubuntu-18.04, ubuntu-20.04] |         os: [macos-latest, windows-latest, ubuntu-20.04] | ||||||
|         python: [3.5.4, 3.6.7, 3.7.5, 3.8.1] |         python: [3.5.4, 3.6.7, 3.7.5, 3.8.1] | ||||||
|     steps: |     steps: | ||||||
|     - name: Checkout |     - name: Checkout | ||||||
| @ -68,7 +68,7 @@ jobs: | |||||||
|     strategy: |     strategy: | ||||||
|       fail-fast: false |       fail-fast: false | ||||||
|       matrix: |       matrix: | ||||||
|         os: [macos-latest, windows-latest, ubuntu-18.04, ubuntu-20.04] |         os: [macos-latest, windows-latest, ubuntu-20.04] | ||||||
|     steps: |     steps: | ||||||
|     - name: Checkout |     - name: Checkout | ||||||
|       uses: actions/checkout@v2 |       uses: actions/checkout@v2 | ||||||
|  | |||||||
							
								
								
									
										3
									
								
								dist/setup/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								dist/setup/index.js
									
									
									
									
										vendored
									
									
								
							| @ -6479,6 +6479,9 @@ function run() { | |||||||
|                     core.info(`Successfully setup PyPy ${installed.resolvedPyPyVersion} with Python (${installed.resolvedPythonVersion})`); |                     core.info(`Successfully setup PyPy ${installed.resolvedPyPyVersion} with Python (${installed.resolvedPythonVersion})`); | ||||||
|                 } |                 } | ||||||
|                 else { |                 else { | ||||||
|  |                     if (version.trim().startsWith('2')) { | ||||||
|  |                         core.warning('The support for python 2.7 will be removed on June 19. Related issue: https://github.com/actions/setup-python/issues/672'); | ||||||
|  |                     } | ||||||
|                     const installed = yield finder.useCpythonVersion(version, arch); |                     const installed = yield finder.useCpythonVersion(version, arch); | ||||||
|                     pythonVersion = installed.version; |                     pythonVersion = installed.version; | ||||||
|                     core.info(`Successfully setup ${installed.impl} (${pythonVersion})`); |                     core.info(`Successfully setup ${installed.impl} (${pythonVersion})`); | ||||||
|  | |||||||
| @ -34,6 +34,11 @@ async function run() { | |||||||
|           `Successfully setup PyPy ${installed.resolvedPyPyVersion} with Python (${installed.resolvedPythonVersion})` |           `Successfully setup PyPy ${installed.resolvedPyPyVersion} with Python (${installed.resolvedPythonVersion})` | ||||||
|         ); |         ); | ||||||
|       } else { |       } else { | ||||||
|  |         if (version.trim().startsWith('2')) { | ||||||
|  |           core.warning( | ||||||
|  |             'The support for python 2.7 will be removed on June 19. Related issue: https://github.com/actions/setup-python/issues/672' | ||||||
|  |           ); | ||||||
|  |         } | ||||||
|         const installed = await finder.useCpythonVersion(version, arch); |         const installed = await finder.useCpythonVersion(version, arch); | ||||||
|         pythonVersion = installed.version; |         pythonVersion = installed.version; | ||||||
|         core.info(`Successfully setup ${installed.impl} (${pythonVersion})`); |         core.info(`Successfully setup ${installed.impl} (${pythonVersion})`); | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Dmitry Shibanov
						Dmitry Shibanov