Compare commits
	
		
			6 Commits
		
	
	
		
			v10.2.5
			...
			feature/wi
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					cce7bb6a3e | ||
| 
						 | 
					90eae2b403 | ||
| 
						 | 
					b044a1d119 | ||
| 
						 | 
					5184d5d985 | ||
| 
						 | 
					aac9386f62 | ||
| 
						 | 
					8db688b818 | 
							
								
								
									
										61
									
								
								.github/workflows/ccpp.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										61
									
								
								.github/workflows/ccpp.yml
									
									
									
									
										vendored
									
									
								
							@@ -5,38 +5,6 @@ on:
 | 
				
			|||||||
    - 'docs/**'
 | 
					    - 'docs/**'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
jobs:
 | 
					jobs:
 | 
				
			||||||
  linux:
 | 
					 | 
				
			||||||
    runs-on: ubuntu-latest
 | 
					 | 
				
			||||||
    steps:
 | 
					 | 
				
			||||||
    - uses: actions/checkout@v1
 | 
					 | 
				
			||||||
    - name: make test
 | 
					 | 
				
			||||||
      run: make test
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  mac_tsan_sectransport:
 | 
					 | 
				
			||||||
    runs-on: macOS-latest
 | 
					 | 
				
			||||||
    steps:
 | 
					 | 
				
			||||||
    - uses: actions/checkout@v1
 | 
					 | 
				
			||||||
    - name: make test_tsan
 | 
					 | 
				
			||||||
      run: make test_tsan
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  mac_tsan_openssl:
 | 
					 | 
				
			||||||
    runs-on: macOS-latest
 | 
					 | 
				
			||||||
    steps:
 | 
					 | 
				
			||||||
    - uses: actions/checkout@v1
 | 
					 | 
				
			||||||
    - name: install openssl
 | 
					 | 
				
			||||||
      run: brew install openssl
 | 
					 | 
				
			||||||
    - name: make test
 | 
					 | 
				
			||||||
      run: make test_tsan_openssl
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  mac_tsan_mbedtls:
 | 
					 | 
				
			||||||
    runs-on: macOS-latest
 | 
					 | 
				
			||||||
    steps:
 | 
					 | 
				
			||||||
    - uses: actions/checkout@v1
 | 
					 | 
				
			||||||
    - name: install mbedtls
 | 
					 | 
				
			||||||
      run: brew install mbedtls
 | 
					 | 
				
			||||||
    - name: make test
 | 
					 | 
				
			||||||
      run: make test_tsan_mbedtls
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  windows_mbedtls:
 | 
					  windows_mbedtls:
 | 
				
			||||||
    runs-on: windows-latest
 | 
					    runs-on: windows-latest
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
@@ -44,35 +12,10 @@ jobs:
 | 
				
			|||||||
    - uses: seanmiddleditch/gha-setup-vsdevenv@master
 | 
					    - uses: seanmiddleditch/gha-setup-vsdevenv@master
 | 
				
			||||||
    - run: |
 | 
					    - run: |
 | 
				
			||||||
        vcpkg install zlib:x64-windows
 | 
					        vcpkg install zlib:x64-windows
 | 
				
			||||||
 | 
					    - run: |
 | 
				
			||||||
        vcpkg install mbedtls:x64-windows
 | 
					        vcpkg install mbedtls:x64-windows
 | 
				
			||||||
    - run: |
 | 
					    - run: |
 | 
				
			||||||
        mkdir build
 | 
					        mkdir build
 | 
				
			||||||
        cd build
 | 
					        cd build
 | 
				
			||||||
        cmake -DCMAKE_TOOLCHAIN_FILE=c:/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_CXX_COMPILER=cl.exe -DUSE_MBED_TLS=1 -DUSE_TLS=1 -DUSE_WS=1 -DUSE_TEST=1 ..
 | 
					        cmake -DCMAKE_TOOLCHAIN_FILE=c:/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_CXX_COMPILER=cl.exe -DUSE_MBED_TLS=1 -DUSE_TLS=1 -DUSE_WS=1 ..
 | 
				
			||||||
    - run: cmake --build build
 | 
					    - run: cmake --build build
 | 
				
			||||||
 | 
					 | 
				
			||||||
    # Running the unittest does not work, the binary cannot be found
 | 
					 | 
				
			||||||
    #- run: ../build/test/ixwebsocket_unittest.exe
 | 
					 | 
				
			||||||
    # working-directory: test
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
#   Windows with OpenSSL is working but disabled as it takes 13 minutes (10 for openssl) to build with vcpkg
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
#   windows_openssl:
 | 
					 | 
				
			||||||
#     runs-on: windows-latest
 | 
					 | 
				
			||||||
#     steps:
 | 
					 | 
				
			||||||
#     - uses: actions/checkout@v1
 | 
					 | 
				
			||||||
#     - uses: seanmiddleditch/gha-setup-vsdevenv@master
 | 
					 | 
				
			||||||
#     - run: |
 | 
					 | 
				
			||||||
#         vcpkg install zlib:x64-windows
 | 
					 | 
				
			||||||
#         vcpkg install openssl:x64-windows
 | 
					 | 
				
			||||||
#     - run: |
 | 
					 | 
				
			||||||
#         mkdir build
 | 
					 | 
				
			||||||
#         cd build
 | 
					 | 
				
			||||||
#         cmake -DCMAKE_TOOLCHAIN_FILE=c:/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_CXX_COMPILER=cl.exe -DUSE_OPEN_SSL=1 -DUSE_TLS=1 -DUSE_WS=1 -DUSE_TEST=1 ..
 | 
					 | 
				
			||||||
#     - run: cmake --build build
 | 
					 | 
				
			||||||
# 
 | 
					 | 
				
			||||||
#     # Running the unittest does not work, the binary cannot be found
 | 
					 | 
				
			||||||
#     #- run: ../build/test/ixwebsocket_unittest.exe
 | 
					 | 
				
			||||||
#     # working-directory: test
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user