diff --git a/.github/workflows/cmake-linux.yml b/.github/workflows/cmake-linux.yml index b866387..36875db 100644 --- a/.github/workflows/cmake-linux.yml +++ b/.github/workflows/cmake-linux.yml @@ -1,11 +1,6 @@ name: CMake Linux Build -on: - push: - pull_request: - types: [opened, reopened] - pull_request_review: - types: [submitted] +on: [push] env: BUILD_TYPE: Release @@ -68,16 +63,16 @@ jobs: with: name: BeamMP-Server-linux-tests path: ${{github.workspace}} - + - name: Install Runtime Dependencies shell: bash run: | sudo apt-get update - sudo apt-get install -y liblua5.3 openssl + sudo apt-get install -y liblua5.3 openssl - name: Test working-directory: ${{github.workspace}} shell: bash run: | - chmod +x ./BeamMP-Server-tests - ./BeamMP-Server-tests + chmod +x ./BeamMP-Server-tests + ./BeamMP-Server-tests diff --git a/.github/workflows/cmake-windows.yml b/.github/workflows/cmake-windows.yml index 131250c..6d0624e 100644 --- a/.github/workflows/cmake-windows.yml +++ b/.github/workflows/cmake-windows.yml @@ -1,11 +1,6 @@ name: CMake Windows Build -on: - push: - pull_request: - types: [opened, reopened] - pull_request_review: - types: [submitted] +on: [push] env: BUILD_TYPE: Release @@ -13,20 +8,20 @@ env: jobs: windows-build: runs-on: windows-latest - + steps: - uses: actions/checkout@v2 with: - submodules: "recursive" - + submodules: 'recursive' + - name: Restore artifacts, or run vcpkg, build and cache artifacts uses: lukka/run-vcpkg@v7 id: runvcpkg with: - vcpkgArguments: "lua zlib rapidjson openssl websocketpp curl" - vcpkgDirectory: "${{ runner.workspace }}/b/vcpkg" + vcpkgArguments: 'lua zlib rapidjson openssl websocketpp curl' + vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg' vcpkgGitCommitId: "06b5f4a769d848d1a20fa0acd556019728b56273" - vcpkgTriplet: "x64-windows-static" + vcpkgTriplet: 'x64-windows-static' - name: Create Build Environment run: cmake -E make_directory ${{github.workspace}}/build-windows @@ -54,9 +49,10 @@ jobs: shell: bash run: | cmake --build . --config Debug - + - name: Archive debug artifacts uses: actions/upload-artifact@v2 with: name: BeamMP-Server-debug.exe path: ${{github.workspace}}/build-windows/Debug/BeamMP-Server.exe +