Compare commits
	
		
			6 Commits
		
	
	
		
			revert-370
			...
			feature/ci
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					84163ad19e | ||
| 
						 | 
					5e5b7c34ca | ||
| 
						 | 
					9bb1de64a4 | ||
| 
						 | 
					df9889947d | ||
| 
						 | 
					6ede8c85b0 | ||
| 
						 | 
					2663f605f4 | 
							
								
								
									
										2
									
								
								.github/workflows/unittest_linux.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/unittest_linux.yml
									
									
									
									
										vendored
									
									
								
							@@ -2,7 +2,7 @@ name: linux
 | 
				
			|||||||
on:
 | 
					on:
 | 
				
			||||||
  push:
 | 
					  push:
 | 
				
			||||||
    paths-ignore:
 | 
					    paths-ignore:
 | 
				
			||||||
    - 'docs/**'
 | 
					    - './**'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
jobs:
 | 
					jobs:
 | 
				
			||||||
  linux:
 | 
					  linux:
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2
									
								
								.github/workflows/unittest_linux_asan.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/unittest_linux_asan.yml
									
									
									
									
										vendored
									
									
								
							@@ -2,7 +2,7 @@ name: linux_asan
 | 
				
			|||||||
on:
 | 
					on:
 | 
				
			||||||
  push:
 | 
					  push:
 | 
				
			||||||
    paths-ignore:
 | 
					    paths-ignore:
 | 
				
			||||||
    - 'docs/**'
 | 
					    - './**'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
jobs:
 | 
					jobs:
 | 
				
			||||||
  linux:
 | 
					  linux:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,7 +2,7 @@ name: mac_tsan_mbedtls
 | 
				
			|||||||
on:
 | 
					on:
 | 
				
			||||||
  push:
 | 
					  push:
 | 
				
			||||||
    paths-ignore:
 | 
					    paths-ignore:
 | 
				
			||||||
    - 'docs/**'
 | 
					    - './**'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
jobs:
 | 
					jobs:
 | 
				
			||||||
  mac_tsan_mbedtls:
 | 
					  mac_tsan_mbedtls:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,7 +2,7 @@ name: mac_tsan_openssl
 | 
				
			|||||||
on:
 | 
					on:
 | 
				
			||||||
  push:
 | 
					  push:
 | 
				
			||||||
    paths-ignore:
 | 
					    paths-ignore:
 | 
				
			||||||
    - 'docs/**'
 | 
					    - './**'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
jobs:
 | 
					jobs:
 | 
				
			||||||
  mac_tsan_openssl:
 | 
					  mac_tsan_openssl:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,7 +2,7 @@ name: mac_tsan_sectransport
 | 
				
			|||||||
on:
 | 
					on:
 | 
				
			||||||
  push:
 | 
					  push:
 | 
				
			||||||
    paths-ignore:
 | 
					    paths-ignore:
 | 
				
			||||||
    - 'docs/**'
 | 
					    - './**'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
jobs:
 | 
					jobs:
 | 
				
			||||||
  mac_tsan_sectransport:
 | 
					  mac_tsan_sectransport:
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										12
									
								
								.github/workflows/unittest_uwp.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										12
									
								
								.github/workflows/unittest_uwp.yml
									
									
									
									
										vendored
									
									
								
							@@ -2,7 +2,7 @@ name: uwp
 | 
				
			|||||||
on:
 | 
					on:
 | 
				
			||||||
  push:
 | 
					  push:
 | 
				
			||||||
    paths-ignore:
 | 
					    paths-ignore:
 | 
				
			||||||
    - 'docs/**'
 | 
					    - './**'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
jobs:
 | 
					jobs:
 | 
				
			||||||
  uwp:
 | 
					  uwp:
 | 
				
			||||||
@@ -10,11 +10,17 @@ jobs:
 | 
				
			|||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
    - uses: actions/checkout@v1
 | 
					    - uses: actions/checkout@v1
 | 
				
			||||||
    - uses: seanmiddleditch/gha-setup-vsdevenv@master
 | 
					    - uses: seanmiddleditch/gha-setup-vsdevenv@master
 | 
				
			||||||
 | 
					    - uses: seanmiddleditch/gha-setup-ninja@master
 | 
				
			||||||
    - run: |
 | 
					    - run: |
 | 
				
			||||||
        mkdir build
 | 
					        mkdir build
 | 
				
			||||||
        cd build
 | 
					        cd build
 | 
				
			||||||
        cmake -DCMAKE_TOOLCHAIN_FILE=c:/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0" -DCMAKE_CXX_COMPILER=cl.exe -DUSE_TEST=1 -DUSE_ZLIB=0 ..
 | 
					        cmake -GNinja -DCMAKE_TOOLCHAIN_FILE=c:/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0" -DCMAKE_CXX_COMPILER=cl.exe -DCMAKE_C_COMPILER=cl.exe -DUSE_TEST=1 -DUSE_ZLIB=0 ..
 | 
				
			||||||
    - run: cmake --build build
 | 
					    - run: |
 | 
				
			||||||
 | 
					        cd build
 | 
				
			||||||
 | 
					        ninja
 | 
				
			||||||
 | 
					    - run: |
 | 
				
			||||||
 | 
					        cd build
 | 
				
			||||||
 | 
					        ninja test
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
#   Windows with OpenSSL is working but disabled as it takes 13 minutes (10 for openssl) to build with vcpkg
 | 
					#   Windows with OpenSSL is working but disabled as it takes 13 minutes (10 for openssl) to build with vcpkg
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										10
									
								
								.github/workflows/unittest_windows.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										10
									
								
								.github/workflows/unittest_windows.yml
									
									
									
									
										vendored
									
									
								
							@@ -10,11 +10,17 @@ jobs:
 | 
				
			|||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
    - uses: actions/checkout@v1
 | 
					    - uses: actions/checkout@v1
 | 
				
			||||||
    - uses: seanmiddleditch/gha-setup-vsdevenv@master
 | 
					    - uses: seanmiddleditch/gha-setup-vsdevenv@master
 | 
				
			||||||
 | 
					    - uses: seanmiddleditch/gha-setup-ninja@master
 | 
				
			||||||
    - run: |
 | 
					    - run: |
 | 
				
			||||||
        mkdir build
 | 
					        mkdir build
 | 
				
			||||||
        cd build
 | 
					        cd build
 | 
				
			||||||
        cmake -DCMAKE_CXX_COMPILER=cl.exe -DUSE_WS=1 -DUSE_TEST=1 -DUSE_ZLIB=0 ..
 | 
					        cmake -GNinja -DCMAKE_CXX_COMPILER=cl.exe -DCMAKE_C_COMPILER=cl.exe -DUSE_WS=1 -DUSE_TEST=1 -DUSE_ZLIB=0 ..
 | 
				
			||||||
    - run: cmake --build build
 | 
					    - run: |
 | 
				
			||||||
 | 
					        cd build
 | 
				
			||||||
 | 
					        ninja
 | 
				
			||||||
 | 
					    - run: |
 | 
				
			||||||
 | 
					        cd build
 | 
				
			||||||
 | 
					        ninja test
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#- run: ../build/test/ixwebsocket_unittest.exe
 | 
					#- run: ../build/test/ixwebsocket_unittest.exe
 | 
				
			||||||
# working-directory: test
 | 
					# working-directory: test
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -17,14 +17,11 @@ set (TEST_TARGET_NAMES
 | 
				
			|||||||
  IXWebSocketTestConnectionDisconnection
 | 
					  IXWebSocketTestConnectionDisconnection
 | 
				
			||||||
  IXUrlParserTest
 | 
					  IXUrlParserTest
 | 
				
			||||||
  IXHttpClientTest
 | 
					  IXHttpClientTest
 | 
				
			||||||
  IXHttpServerTest
 | 
					 | 
				
			||||||
  IXUnityBuildsTest
 | 
					  IXUnityBuildsTest
 | 
				
			||||||
  IXHttpTest
 | 
					  IXHttpTest
 | 
				
			||||||
  IXDNSLookupTest
 | 
					  IXDNSLookupTest
 | 
				
			||||||
  IXWebSocketSubProtocolTest
 | 
					  IXWebSocketSubProtocolTest
 | 
				
			||||||
  IXWebSocketChatTest
 | 
					 | 
				
			||||||
  # IXWebSocketBroadcastTest ## FIXME was depending on cobra / take a broadcast server from ws
 | 
					  # IXWebSocketBroadcastTest ## FIXME was depending on cobra / take a broadcast server from ws
 | 
				
			||||||
  IXWebSocketPerMessageDeflateCompressorTest
 | 
					 | 
				
			||||||
  IXStrCaseCompareTest
 | 
					  IXStrCaseCompareTest
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -33,6 +30,17 @@ set (TEST_TARGET_NAMES
 | 
				
			|||||||
if (UNIX)
 | 
					if (UNIX)
 | 
				
			||||||
  list(APPEND TEST_TARGET_NAMES
 | 
					  list(APPEND TEST_TARGET_NAMES
 | 
				
			||||||
    IXWebSocketCloseTest
 | 
					    IXWebSocketCloseTest
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # Fail on Windows in CI probably because the pathing is wrong and
 | 
				
			||||||
 | 
					    # some resource files cannot be found
 | 
				
			||||||
 | 
					    IXHttpServerTest
 | 
				
			||||||
 | 
					    IXWebSocketChatTest
 | 
				
			||||||
 | 
					  )
 | 
				
			||||||
 | 
					endif()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					if (USE_ZLIB)
 | 
				
			||||||
 | 
					  list(APPEND TEST_TARGET_NAMES
 | 
				
			||||||
 | 
					    IXWebSocketPerMessageDeflateCompressorTest
 | 
				
			||||||
  )
 | 
					  )
 | 
				
			||||||
endif()
 | 
					endif()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user