From e29c55dd98d636d525acbff1317eb3f26b5bf3a3 Mon Sep 17 00:00:00 2001 From: ddutchie Date: Thu, 14 Mar 2024 21:35:22 +0000 Subject: [PATCH] CI Changes to Alow Building Linux and Android [From FORK] --- .ci/scripts/linux/docker.sh | 4 ++-- .gitignore | 2 ++ .gitlab-ci.yml | 30 ++++++++++++++++++------- src/video_core/host1x/ffmpeg/ffmpeg.cpp | 4 ++-- 4 files changed, 28 insertions(+), 12 deletions(-) mode change 100644 => 100755 .gitlab-ci.yml diff --git a/.ci/scripts/linux/docker.sh b/.ci/scripts/linux/docker.sh index 75e73401b2..7a734a08d9 100755 --- a/.ci/scripts/linux/docker.sh +++ b/.ci/scripts/linux/docker.sh @@ -1,6 +1,6 @@ #!/bin/bash -ex - -# SPDX-FileCopyrightText: 2019 yuzu Emulator Project & 2024 suyu Emulator Project +# SPDX-FileCopyrightText: 2019 yuzu Emulator Project +# SPDX-FileCopyrightText: 2024 suyu Emulator Project # SPDX-License-Identifier: GPL-2.0-or-later # Exit on error, rather than continuing with the rest of the script. diff --git a/.gitignore b/.gitignore index 2bb96e0e56..0e06e5aa00 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,5 @@ CMakeSettings.json # Windows global filetypes Thumbs.db +# Local Gitlab CI Runner +.gitlab-ci-local/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml old mode 100644 new mode 100755 index 874fcf6fa3..3f8113bfbf --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,27 +1,41 @@ stages: - format - build - +#CLANG FORMAT - CHECKS CODE FOR FORMATTING ISSUES clang-format: stage: format - image: suyuemu/cibuild:linux-x64 + image: registry.gitlab.com/ddutchie/ci-docker:clangformat + #TODO: SET THIS TO FALSE!!! allow_failure: true - variables: - RELEASE_NAME: mainline script: - git submodule update --init --depth 1 --recursive - bash .ci/scripts/format/script.sh - +#LINUX BUILD - BUILDS LINUX APPIMAGE build-linux: stage: build - image: suyuemu/cibuild:linux-x64 + image: registry.gitlab.com/ddutchie/ci-docker:linux-x64 resource_group: linux-ci variables: - RELEASE_NAME: mainline + GIT_SUBMODULE_STRATEGY: recursive + GIT_SUBMODULE_DEPTH: 1 + RELEASE_NAME: mainline script: - - git submodule update --init --depth 1 --recursive - bash .ci/scripts/linux/docker.sh - bash .ci/scripts/linux/upload.sh artifacts: paths: - artifacts/* +#ANDROID BUILD - BUILDS APK +android: + stage: build + image: registry.gitlab.com/ddutchie/ci-docker:android-x64 + script: + - apt-get update -y + - git submodule update --init --recursive + - export ANDROID_HOME="/usr/lib/android-sdk/" + - echo y | sdkmanager --sdk_root=/usr/lib/android-sdk --licenses + - bash ./.ci/scripts/android/build.sh + - bash ./.ci/scripts/android/upload.sh + artifacts: + paths: + - artifacts/* diff --git a/src/video_core/host1x/ffmpeg/ffmpeg.cpp b/src/video_core/host1x/ffmpeg/ffmpeg.cpp index 6655399c64..995673bc5c 100644 --- a/src/video_core/host1x/ffmpeg/ffmpeg.cpp +++ b/src/video_core/host1x/ffmpeg/ffmpeg.cpp @@ -217,7 +217,7 @@ bool DecoderContext::OpenContext(const Decoder& decoder) { return true; } - +#ifndef ANDROID // Nasty but allows linux builds to pass. // Requires double checks when FFMPEG gets updated. // Hopefully a future FFMPEG update will all and expose a solution in the public API. @@ -376,7 +376,7 @@ static av_always_inline const FFCodec* ffcodec(const AVCodec* codec) { } } // namespace - +#endif bool DecoderContext::SendPacket(const Packet& packet) { m_temp_frame = std::make_shared(); m_got_frame = 0;