Merge branch 'js/ci-use-macos-13'
Replace macos-12 used at GitHub CI with macos-13. * js/ci-use-macos-13: ci: upgrade to using macos-13
This commit is contained in:
		
							
								
								
									
										6
									
								
								.github/workflows/main.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								.github/workflows/main.yml
									
									
									
									
										vendored
									
									
								
							@ -276,11 +276,11 @@ jobs:
 | 
			
		||||
            pool: ubuntu-20.04
 | 
			
		||||
          - jobname: osx-clang
 | 
			
		||||
            cc: clang
 | 
			
		||||
            pool: macos-12
 | 
			
		||||
            pool: macos-13
 | 
			
		||||
          - jobname: osx-gcc
 | 
			
		||||
            cc: gcc
 | 
			
		||||
            cc_package: gcc-9
 | 
			
		||||
            pool: macos-12
 | 
			
		||||
            cc_package: gcc-13
 | 
			
		||||
            pool: macos-13
 | 
			
		||||
          - jobname: linux-gcc-default
 | 
			
		||||
            cc: gcc
 | 
			
		||||
            pool: ubuntu-latest
 | 
			
		||||
 | 
			
		||||
@ -253,11 +253,9 @@ ubuntu-*)
 | 
			
		||||
	export PATH="$GIT_LFS_PATH:$P4_PATH:$PATH"
 | 
			
		||||
	;;
 | 
			
		||||
macos-*)
 | 
			
		||||
	if [ "$jobname" = osx-gcc ]
 | 
			
		||||
	then
 | 
			
		||||
	MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)"
 | 
			
		||||
	else
 | 
			
		||||
		MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python2)"
 | 
			
		||||
	if [ "$jobname" != osx-gcc ]
 | 
			
		||||
	then
 | 
			
		||||
		MAKEFLAGS="$MAKEFLAGS APPLE_COMMON_CRYPTO_SHA1=Yes"
 | 
			
		||||
	fi
 | 
			
		||||
	;;
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user