Fix Ubuntu CI builds (#4212)
This commit is contained in:
@@ -8,7 +8,7 @@ on:
|
|||||||
pull_request:
|
pull_request:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
concurrency:
|
concurrency:
|
||||||
group: build-${{ github.ref }}
|
group: build-${{ github.ref }}
|
||||||
cancel-in-progress: true
|
cancel-in-progress: true
|
||||||
|
|
||||||
@@ -64,12 +64,12 @@ jobs:
|
|||||||
- name: Add Conan to path
|
- name: Add Conan to path
|
||||||
if: startsWith(matrix.os, 'windows')
|
if: startsWith(matrix.os, 'windows')
|
||||||
run: echo "C:\Program Files\Conan\conan\" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
|
run: echo "C:\Program Files\Conan\conan\" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
|
||||||
|
|
||||||
- name: Install dependencies (Windows)
|
- name: Install dependencies (Windows)
|
||||||
if: startsWith(matrix.os, 'windows')
|
if: startsWith(matrix.os, 'windows')
|
||||||
run: |
|
run: |
|
||||||
choco install conan -y
|
choco install conan -y
|
||||||
|
|
||||||
- name: Enable Developer Command Prompt
|
- name: Enable Developer Command Prompt
|
||||||
if: startsWith(matrix.os, 'windows')
|
if: startsWith(matrix.os, 'windows')
|
||||||
uses: ilammy/msvc-dev-cmd@v1.12.0
|
uses: ilammy/msvc-dev-cmd@v1.12.0
|
||||||
@@ -99,7 +99,7 @@ jobs:
|
|||||||
if: startsWith(matrix.os, 'windows')
|
if: startsWith(matrix.os, 'windows')
|
||||||
run: conan remove "*" -fsb
|
run: conan remove "*" -fsb
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
# LINUX
|
# LINUX
|
||||||
- name: Install dependencies (Ubuntu)
|
- name: Install dependencies (Ubuntu)
|
||||||
if: startsWith(matrix.os, 'ubuntu')
|
if: startsWith(matrix.os, 'ubuntu')
|
||||||
@@ -109,6 +109,7 @@ jobs:
|
|||||||
cmake \
|
cmake \
|
||||||
virtualenv \
|
virtualenv \
|
||||||
rapidjson-dev \
|
rapidjson-dev \
|
||||||
|
libfuse2 \
|
||||||
libssl-dev \
|
libssl-dev \
|
||||||
libboost-dev \
|
libboost-dev \
|
||||||
libxcb-randr0-dev \
|
libxcb-randr0-dev \
|
||||||
|
|||||||
Reference in New Issue
Block a user