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/v2 (#675)
* add warning * remove ubuntu-18.04 * remove macos-10.15 * fix pypy3
This commit is contained in:
		
							parent
							
								
									75f3110429
								
							
						
					
					
						commit
						e9aba2c848
					
				
							
								
								
									
										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' | ||||||
|  | |||||||
							
								
								
									
										15
									
								
								.github/workflows/test-python.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										15
									
								
								.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 | ||||||
| @ -97,7 +97,7 @@ jobs: | |||||||
|     strategy: |     strategy: | ||||||
|       fail-fast: false |       fail-fast: false | ||||||
|       matrix: |       matrix: | ||||||
|         os: [macos-10.15, windows-2019, ubuntu-18.04, ubuntu-20.04] |         os: [macos-11, windows-2019, ubuntu-20.04] | ||||||
|     steps: |     steps: | ||||||
|     - name: Checkout |     - name: Checkout | ||||||
|       uses: actions/checkout@v2 |       uses: actions/checkout@v2 | ||||||
| @ -105,9 +105,4 @@ jobs: | |||||||
|     - name: setup-python pypy3 |     - name: setup-python pypy3 | ||||||
|       uses: ./ |       uses: ./ | ||||||
|       with: |       with: | ||||||
|         python-version: 'pypy3' |         python-version: 'pypy-3.8' | ||||||
| 
 |  | ||||||
|     - name: setup-python pypy2 |  | ||||||
|       uses: ./ |  | ||||||
|       with: |  | ||||||
|         python-version: 'pypy2' |  | ||||||
|  | |||||||
							
								
								
									
										3
									
								
								dist/setup/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								dist/setup/index.js
									
									
									
									
										vendored
									
									
								
							| @ -7010,6 +7010,9 @@ function run() { | |||||||
|         try { |         try { | ||||||
|             const version = core.getInput('python-version'); |             const version = core.getInput('python-version'); | ||||||
|             if (version) { |             if (version) { | ||||||
|  |                 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'); | ||||||
|  |                 } | ||||||
|                 let pythonVersion; |                 let pythonVersion; | ||||||
|                 const arch = core.getInput('architecture') || os.arch(); |                 const arch = core.getInput('architecture') || os.arch(); | ||||||
|                 if (isPyPyVersion(version)) { |                 if (isPyPyVersion(version)) { | ||||||
|  | |||||||
| @ -28,6 +28,11 @@ async function run() { | |||||||
|   try { |   try { | ||||||
|     const version = core.getInput('python-version'); |     const version = core.getInput('python-version'); | ||||||
|     if (version) { |     if (version) { | ||||||
|  |       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' | ||||||
|  |         ); | ||||||
|  |       } | ||||||
|       let pythonVersion: string; |       let pythonVersion: string; | ||||||
|       const arch: string = core.getInput('architecture') || os.arch(); |       const arch: string = core.getInput('architecture') || os.arch(); | ||||||
|       if (isPyPyVersion(version)) { |       if (isPyPyVersion(version)) { | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Dmitry Shibanov
						Dmitry Shibanov