Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

💚 Fixed linux build #1075

Merged
merged 1 commit into from
Sep 27, 2023
Merged

💚 Fixed linux build #1075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions .github/workflows/build-game.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
submodules: true

- name: Cache conan
uses: actions/cache@v3.3.2
uses: actions/cache@v3
with:
key: conan-win-${{ hashFiles('conanfile.py') }}
path: ~/.conan2/
Expand Down Expand Up @@ -62,7 +62,8 @@ jobs:
submodules: true

- name: Cache conan
uses: actions/[email protected]
id: cache-conan
uses: actions/cache@v3
with:
key: conan-linux-${{ hashFiles('conanfile.py') }}
path: ~/.conan2/
Expand Down Expand Up @@ -108,11 +109,17 @@ jobs:
libxcb-util0-dev \
libxcb-dri3-dev

- name: Configure
run: |
- name: Fix broken mpg123 lib
if: steps.cache-conan.outputs.cache-hit != 'true'
run: |
conan profile detect --force
echo "tools.system.package_manager:mode = install" > ~/.conan2/global.conf
echo "tools.system.package_manager:sudo = True" >> ~/.conan2/global.conf
conan remote add overte https://git.anotherfoxguy.com/api/packages/overte/conan -f
conan install --requires mpg123/1.31.2 -b mpg123/1.31.2 -b missing

- name: Configure
run: |
conan install . -s build_type=Release -b missing -pr:b=default -c tools.cmake.cmaketoolchain:generator="Ninja"
cmake --preset conan-release

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-json.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4.1.0
- uses: actions/checkout@v4

- name: Check if images exist
run: node ./tools/CI/check-jsons.js
14 changes: 11 additions & 3 deletions .github/workflows/sonarcloud.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ jobs:
sudo chmod 777 run-sonar-scanner

- name: Cache conan
uses: actions/[email protected]
id: cache-conan
uses: actions/cache@v3
with:
key: conan-linux-${{ hashFiles('conanfile.py') }}
path: ~/.conan2/
Expand Down Expand Up @@ -73,11 +74,18 @@ jobs:
libxcb-util0-dev \
libxcb-dri3-dev

- name: Configure
run: |

- name: Fix broken mpg123 lib
if: steps.cache-conan.outputs.cache-hit != 'true'
run: |
conan profile detect --force
echo "tools.system.package_manager:mode = install" > ~/.conan2/global.conf
echo "tools.system.package_manager:sudo = True" >> ~/.conan2/global.conf
conan remote add overte https://git.anotherfoxguy.com/api/packages/overte/conan -f
conan install --requires mpg123/1.31.2 -b mpg123/1.31.2 -b missing

- name: Configure
run: |
conan install . -s build_type=Release -b missing -pr:b=default
cmake --preset conan-release -DBUILD_TEST=ON -DENABLE_COVERAGE=ON

Expand Down