octo
/
citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: Run clang-format and transifex in linux-fresh image. (#6649) 

* ci: Run clang-format and transifex in linux-fresh image.

* build: Only add bundle targets for enabled outputs.
This commit is contained in:
Steveice10 2023-06-29 00:44:13 -07:00 committed by GitHub
parent 0d516f6da5
commit d26dcc8e31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View File

@ -11,7 +11,7 @@ jobs:
clang-format: clang-format:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: container:
image: citraemu/build-environments:linux-clang-format image: citraemu/build-environments:linux-fresh
options: -u 1001 options: -u 1001
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@ -239,7 +239,7 @@ jobs:
path: src/android/app/artifacts/ path: src/android/app/artifacts/
transifex: transifex:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: citraemu/build-environments:linux-transifex container: citraemu/build-environments:linux-fresh
if: ${{ github.repository == 'citra-emu/citra' && !github.head_ref }} if: ${{ github.repository == 'citra-emu/citra' && !github.head_ref }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3

6
CMakeLists.txt
View File

@ -389,10 +389,16 @@ endif()
# Create target for outputting distributable bundles. # Create target for outputting distributable bundles.
if (NOT ANDROID AND NOT IOS) if (NOT ANDROID AND NOT IOS)
include(BundleTarget) include(BundleTarget)
if (ENABLE_SDL2_FRONTEND)
bundle_target(citra) bundle_target(citra)
endif()
if (ENABLE_QT)
bundle_target(citra-qt) bundle_target(citra-qt)
endif()
if (ENABLE_DEDICATED_ROOM)
bundle_target(citra-room) bundle_target(citra-room)
endif() endif()
endif()
# Installation instructions # Installation instructions
# ========================= # =========================