fix release action

This commit is contained in:
Lion Kortlepel
2021-02-13 22:17:08 +01:00
parent f9cb9af078
commit 43690d0833
2 changed files with 15 additions and 11 deletions
-1
View File
@@ -11,7 +11,6 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: lukka/get-cmake@latest
- name: Restore artifacts, or run vcpkg, build and cache artifacts - name: Restore artifacts, or run vcpkg, build and cache artifacts
uses: lukka/run-vcpkg@main uses: lukka/run-vcpkg@main
+10 -5
View File
@@ -31,10 +31,14 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: create-release needs: create-release
steps: steps:
- name: Checkout code - uses: actions/checkout@v2
uses: actions/checkout@v2
- name: Install Dependencies - 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 - name: Create Build Environment
run: cmake -E make_directory ${{github.workspace}}/build-linux run: cmake -E make_directory ${{github.workspace}}/build-linux
@@ -66,16 +70,17 @@ jobs:
needs: create-release needs: create-release
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: lukka/get-cmake@latest
- name: Restore artifacts, or run vcpkg, build and cache artifacts - name: Restore artifacts, or run vcpkg, build and cache artifacts
uses: lukka/run-vcpkg@main uses: lukka/run-vcpkg@main
id: runvcpkg id: runvcpkg
with: with:
vcpkgArguments: 'lua zlib rapidjson curl' vcpkgArguments: 'lua zlib rapidjson boost-beast boost-asio openssl'
vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg' vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
vcpkgGitCommitId: '30124253eecff36bc90f73341edbfb4f845e2a1e' vcpkgGitCommitId: '30124253eecff36bc90f73341edbfb4f845e2a1e'
vcpkgTriplet: 'x64-windows-static' vcpkgTriplet: 'x64-windows-static'
appendedCacheKey: ${{ hashFiles( '**/vcpkg_manifest/vcpkg.json' ) }}
additionalCachedPaths: ${{ env.buildDir }}/vcpkg_installed
- name: Create Build Environment - name: Create Build Environment
run: cmake -E make_directory ${{github.workspace}}/build-windows run: cmake -E make_directory ${{github.workspace}}/build-windows