diff --git a/.github/workflows/cmake-windows.yml b/.github/workflows/cmake-windows.yml index b372ef9..68494ef 100644 --- a/.github/workflows/cmake-windows.yml +++ b/.github/workflows/cmake-windows.yml @@ -11,7 +11,6 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: lukka/get-cmake@latest - name: Restore artifacts, or run vcpkg, build and cache artifacts uses: lukka/run-vcpkg@main diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 20500ca..1677e67 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -31,19 +31,23 @@ jobs: runs-on: ubuntu-latest needs: create-release steps: - - name: Checkout code - uses: actions/checkout@v2 + - uses: actions/checkout@v2 + - name: Install Dependencies - run: sudo apt-get update && sudo apt-get install -y libz-dev rapidjson-dev libcurl4-openssl-dev liblua5.3 - + run: | + sudo apt-get update + sudo apt-get install -y libz-dev rapidjson-dev liblua5.3 libssl-dev + sudo add-apt-repository ppa:mhier/libboost-latest + sudo apt-get install -y libboost1.70-dev libboost1.70 + - name: Create Build Environment run: cmake -E make_directory ${{github.workspace}}/build-linux - + - name: Configure CMake shell: bash working-directory: ${{github.workspace}}/build-linux run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_COMPILER=g++-10 - + - name: Build working-directory: ${{github.workspace}}/build-linux shell: bash @@ -66,16 +70,17 @@ jobs: needs: create-release steps: - uses: actions/checkout@v2 - - uses: lukka/get-cmake@latest - name: Restore artifacts, or run vcpkg, build and cache artifacts uses: lukka/run-vcpkg@main id: runvcpkg with: - vcpkgArguments: 'lua zlib rapidjson curl' + vcpkgArguments: 'lua zlib rapidjson boost-beast boost-asio openssl' vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg' vcpkgGitCommitId: '30124253eecff36bc90f73341edbfb4f845e2a1e' vcpkgTriplet: 'x64-windows-static' + appendedCacheKey: ${{ hashFiles( '**/vcpkg_manifest/vcpkg.json' ) }} + additionalCachedPaths: ${{ env.buildDir }}/vcpkg_installed - name: Create Build Environment run: cmake -E make_directory ${{github.workspace}}/build-windows @@ -88,8 +93,8 @@ jobs: - name: Build working-directory: ${{github.workspace}}/build-windows shell: bash - run: cmake --build . --config $BUILD_TYPE - + run: cmake --build . --config $BUILD_TYPE + - name: Upload Release Asset id: upload-release-asset uses: actions/upload-release-asset@v1