From 7e17961259819a0f5f80d3f840a56c6bfdba17fe Mon Sep 17 00:00:00 2001 From: Fijxu Date: Sat, 16 Mar 2024 21:25:56 +0000 Subject: [PATCH 1/5] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 14121961e0..df70325505 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,38 +1,6 @@ stages: - - format - build -#CLANG FORMAT - CHECKS CODE FOR FORMATTING ISSUES -clang-format: - stage: format - image: suyuemu/cibuild:clangformat - #THIS HAS TO BE FALSE. IT KEEPS RESOURCES AVAILABLE - EG RUNNERS WONT TRY BUILDING IF CODEBASE IS WRONG - #MR's NEED TO BE CORRECTLY CLANG FORMATTED - allow_failure: false - script: - - git submodule update --init --depth 1 --recursive - - bash .ci/scripts/format/script.sh - tags: - # - Linux - # - Windows - - Parallelized -#LINUX BUILD - BUILDS LINUX APPIMAGE -build-linux: - stage: build - image: suyuemu/cibuild:linux-x64 - resource_group: linux-ci - variables: - GIT_SUBMODULE_STRATEGY: recursive - GIT_SUBMODULE_DEPTH: 1 - RELEASE_NAME: mainline - script: - - bash .ci/scripts/linux/docker.sh - - bash .ci/scripts/linux/upload.sh - artifacts: - paths: - - artifacts/* - tags: - - Linux - - Parallelized + #ANDROID BUILD - BUILDS APK android: stage: build From 39b6f9b4c6af09fdc28eb04f5bb42bc843b105c7 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Sat, 16 Mar 2024 21:26:06 +0000 Subject: [PATCH 2/5] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df70325505..5eeeea3f6d 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,3 +21,4 @@ android: tags: - Linux - Parallelized + - Testing From 209c2ac762c966aaed8aadd85ba71c2e6263c08f Mon Sep 17 00:00:00 2001 From: Fijxu Date: Sat, 16 Mar 2024 21:29:12 +0000 Subject: [PATCH 3/5] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5eeeea3f6d..353d56b6fd 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,3 +22,4 @@ android: - Linux - Parallelized - Testing + - Fijxu From a12955236f4f2a0f1a44ecd536c8b2fc9c695bb0 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Sat, 16 Mar 2024 19:08:22 -0300 Subject: [PATCH 4/5] feature: Store CCACHE cache in CI cache --- .ci/scripts/linux/docker.sh | 2 ++ .gitlab-ci.yml | 61 +++++++++++++++++++++++++++++++++++-- 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/.ci/scripts/linux/docker.sh b/.ci/scripts/linux/docker.sh index c6b6590db2..8e80878434 100755 --- a/.ci/scripts/linux/docker.sh +++ b/.ci/scripts/linux/docker.sh @@ -11,6 +11,8 @@ ccache -s mkdir build || true && cd build cmake .. \ -DBoost_USE_STATIC_LIBS=ON \ + -DSUYU_USE_PRECOMPILED_HEADERS=OFF \ + -DDYNARMIC_USE_PRECOMPILED_HEADERS=OFF \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_CXX_FLAGS="-march=x86-64-v2" \ -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ \ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 353d56b6fd..0a251e87b9 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,64 @@ stages: + - format - build +variables: + # https://docs.gitlab.com/ee/ci/runners/configure_runners.html + TRANSFER_METER_FREQUENCY: "2s" + ARTIFACT_COMPRESSION_LEVEL: "fast" + CACHE_COMPRESSION_LEVEL: "fastest" + CACHE_REQUEST_TIMEOUT: 5 + # Use FASTZIP for faster compression in cache and artifacts + # https://docs.gitlab.com/runner/configuration/feature-flags.html#available-feature-flags + FF_USE_FASTZIP: true + + # Our Variables + CACHE_DIR: "$CI_PROJECT_DIR/ccache" + CCACHE_DIR: $CACHE_DIR + + +#CLANG FORMAT - CHECKS CODE FOR FORMATTING ISSUES +clang-format: + stage: format + image: suyuemu/cibuild:clangformat + #THIS HAS TO BE FALSE. IT KEEPS RESOURCES AVAILABLE - EG RUNNERS WONT TRY BUILDING IF CODEBASE IS WRONG + #MR's NEED TO BE CORRECTLY CLANG FORMATTED + allow_failure: false + script: + - git submodule update --init --depth 1 --recursive + - bash .ci/scripts/format/script.sh + tags: + # - Linux + # - Windows + - Parallelized + +#LINUX BUILD - BUILDS LINUX APPIMAGE +build-linux: + stage: build + image: suyuemu/cibuild:linux-x64 + resource_group: linux-ci + cache: + key: "$CI_COMMIT_REF_NAME-ccache" + paths: + - $CACHE_DIR + before_script: + - mkdir -p $CACHE_DIR + - chmod -R 777 $CACHE_DIR + - ls -la $CACHE_DIR + variables: + GIT_SUBMODULE_STRATEGY: recursive + GIT_SUBMODULE_DEPTH: 1 + RELEASE_NAME: mainline + script: + - bash .ci/scripts/linux/docker.sh + - bash .ci/scripts/linux/upload.sh + artifacts: + paths: + - artifacts/* + tags: + - Linux + - Parallelized + #ANDROID BUILD - BUILDS APK android: stage: build @@ -21,5 +79,4 @@ android: tags: - Linux - Parallelized - - Testing - - Fijxu + From 2060ec4055dd17d6975b966853fd05d8939b9e1d Mon Sep 17 00:00:00 2001 From: Fijxu Date: Sat, 16 Mar 2024 19:25:08 -0300 Subject: [PATCH 5/5] minor fix: Add missing optional header --- src/core/hle/service/nvnflinger/hardware_composer.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/core/hle/service/nvnflinger/hardware_composer.cpp b/src/core/hle/service/nvnflinger/hardware_composer.cpp index f2dfe85a96..8140dbb518 100644 --- a/src/core/hle/service/nvnflinger/hardware_composer.cpp +++ b/src/core/hle/service/nvnflinger/hardware_composer.cpp @@ -1,6 +1,8 @@ // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project +// SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later +#include #include #include "common/microprofile.h"