From d26dcc8e31bc713dafd1a4ff552ae626351f58f5 Mon Sep 17 00:00:00 2001 From: Steveice10 <1269164+Steveice10@users.noreply.github.com> Date: Thu, 29 Jun 2023 00:44:13 -0700 Subject: [PATCH] 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. --- .github/workflows/ci.yml | 4 ++-- CMakeLists.txt | 12 +++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b6a277fd49..162c2532a3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: clang-format: runs-on: ubuntu-latest container: - image: citraemu/build-environments:linux-clang-format + image: citraemu/build-environments:linux-fresh options: -u 1001 steps: - uses: actions/checkout@v3 @@ -239,7 +239,7 @@ jobs: path: src/android/app/artifacts/ transifex: 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 }} steps: - uses: actions/checkout@v3 diff --git a/CMakeLists.txt b/CMakeLists.txt index 265d1bcb10..19d59f685d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -389,9 +389,15 @@ endif() # Create target for outputting distributable bundles. if (NOT ANDROID AND NOT IOS) include(BundleTarget) - bundle_target(citra) - bundle_target(citra-qt) - bundle_target(citra-room) + if (ENABLE_SDL2_FRONTEND) + bundle_target(citra) + endif() + if (ENABLE_QT) + bundle_target(citra-qt) + endif() + if (ENABLE_DEDICATED_ROOM) + bundle_target(citra-room) + endif() endif() # Installation instructions