Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Suyu
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
many-archive
Suyu
Commits
e29c55dd
There was an error fetching the commit references. Please try again later.
Commit
e29c55dd
authored
1 year ago
by
ddutchie
Browse files
Options
Downloads
Patches
Plain Diff
CI Changes to Alow Building Linux and Android [From FORK]
parent
3037f0b8
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.ci/scripts/linux/docker.sh
+2
-2
2 additions, 2 deletions
.ci/scripts/linux/docker.sh
.gitignore
+2
-0
2 additions, 0 deletions
.gitignore
.gitlab-ci.yml
+22
-8
22 additions, 8 deletions
.gitlab-ci.yml
src/video_core/host1x/ffmpeg/ffmpeg.cpp
+2
-2
2 additions, 2 deletions
src/video_core/host1x/ffmpeg/ffmpeg.cpp
with
28 additions
and
12 deletions
.ci/scripts/linux/docker.sh
+
2
−
2
View file @
e29c55dd
#!/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.
...
...
This diff is collapsed.
Click to expand it.
.gitignore
+
2
−
0
View file @
e29c55dd
...
...
@@ -37,3 +37,5 @@ CMakeSettings.json
# Windows global filetypes
Thumbs.db
# Local Gitlab CI Runner
.gitlab-ci-local/
This diff is collapsed.
Click to expand it.
.gitlab-ci.yml
100644 → 100755
+
22
−
8
View file @
e29c55dd
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/*
This diff is collapsed.
Click to expand it.
src/video_core/host1x/ffmpeg/ffmpeg.cpp
+
2
−
2
View file @
e29c55dd
...
...
@@ -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
<
Frame
>
();
m_got_frame
=
0
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment