diff --git a/.github/workflows/building.yml b/.github/workflows/building.yml index aba5c8c..c2bf59a 100644 --- a/.github/workflows/building.yml +++ b/.github/workflows/building.yml @@ -44,12 +44,28 @@ jobs: - name: Run unit tests run: ctest --test-dir build + + - name: Prep release + run: | + rm Release/Beacons/* + rm Release/Beacons/.gitignore + rm Release/Client/.gitignore + rm Release/Client/logs/.gitignore + rm Release/Modules/* + rm Release/Modules/.gitignore + rm Release/Scripts/.gitignore + rm Release/TeamServer/.gitignore + rm Release/Tools/.gitignore + rm Release/www/.gitignore + tar -zcvf Release.tar.gz Release + + - name: Upload release uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: Release/TeamServer/TeamServer - asset_name: TeamServer + file: Release/TeamServer/Release.tar.gz + asset_name: Release.tar.gz tag: ${{ github.ref }} overwrite: true body: "test release" diff --git a/CMakeLists.txt b/CMakeLists.txt index 5888890..c7b2bfa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,7 +43,7 @@ enable_testing() add_subdirectory(teamServer) -#add_subdirectory(certs) +add_subdirectory(certs) add_subdirectory(client) diff --git a/Release/downloadLastArtifact.sh b/Release/downloadLastArtifact.sh new file mode 100644 index 0000000..503fa1d --- /dev/null +++ b/Release/downloadLastArtifact.sh @@ -0,0 +1 @@ +#TODO \ No newline at end of file diff --git a/certs/CMakeLists.txt b/certs/CMakeLists.txt index 8ed26b5..5b57234 100644 --- a/certs/CMakeLists.txt +++ b/certs/CMakeLists.txt @@ -34,5 +34,5 @@ else() # server.crt for client file(COPY ${CMAKE_BINARY_DIR}/certs/sslTeamServ/server.pem DESTINATION ${CMAKE_SOURCE_DIR}/Release/Client/) - file(RENAME ${CMAKE_SOURCE_DIR}/Release/Client/server.pem ${CMAKE_SOURCE_DIR}/Release/Client/rootCA.crt) + file(RENAME ${CMAKE_SOURCE_DIR}/Release/Client/server.pem ${CMAKE_SOURCE_DIR}/Release/Client/server.crt) endif() \ No newline at end of file diff --git a/client/grpcClient.py b/client/grpcClient.py index fde26d6..324dc8f 100644 --- a/client/grpcClient.py +++ b/client/grpcClient.py @@ -14,7 +14,7 @@ class GrpcClient: def __init__(self, ip, port): - ca_cert = './rootCA.crt' + ca_cert = './server.crt' root_certs = open(ca_cert, 'rb').read() credentials = grpc.ssl_channel_credentials(root_certs)