Compare commits
10 Commits
b3ee5fe196
...
56a58a0c42
Author | SHA1 | Date |
---|---|---|
liushuyu | 56a58a0c42 | |
liushuyu | 7535f22b8f | |
liushuyu | 9991dcf1f5 | |
liushuyu | cf5b105992 | |
liushuyu | 1b4fe1055c | |
liushuyu | 412e62e61e | |
liushuyu | ce9f1a91f7 | |
liushuyu | 630511f1f4 | |
liushuyu | c9bf9398ec | |
liushuyu | e466025a1e |
12
.ci/deps.sh
12
.ci/deps.sh
|
@ -1,11 +1,11 @@
|
|||
#!/bin/bash -e
|
||||
|
||||
FMT_VERSION="10.1.0"
|
||||
JSON_VERSION="3.11.2"
|
||||
FMT_VERSION="10.2.1"
|
||||
JSON_VERSION="3.11.3"
|
||||
ZLIB_VERSION="1.3"
|
||||
ZSTD_VERSION="1.5.5"
|
||||
LZ4_VERSION="1.9.4"
|
||||
BOOST_VERSION="1.83.0"
|
||||
BOOST_VERSION="1.84.0"
|
||||
|
||||
cmake_install() {
|
||||
cmake . -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON "$@"
|
||||
|
@ -28,12 +28,12 @@ info() {
|
|||
}
|
||||
|
||||
info "fmt ${FMT_VERSION}"
|
||||
download_extract "https://github.com/fmtlib/fmt/releases/download/${FMT_VERSION}/fmt-${FMT_VERSION}.zip" "fmt-${FMT_VERSION}" d725fa83a8b57a3cedf238828fa6b167f963041e8f9f7327649bddc68ae316f4
|
||||
download_extract "https://github.com/fmtlib/fmt/releases/download/${FMT_VERSION}/fmt-${FMT_VERSION}.zip" "fmt-${FMT_VERSION}" 312151a2d13c8327f5c9c586ac6cf7cddc1658e8f53edae0ec56509c8fa516c9
|
||||
cmake_install -DFMT_DOC=OFF -DFMT_TEST=OFF
|
||||
popd
|
||||
|
||||
info "nlohmann_json ${JSON_VERSION}"
|
||||
download_extract "https://github.com/nlohmann/json/releases/download/v${JSON_VERSION}/json.tar.xz" json 8c4b26bf4b422252e13f332bc5e388ec0ab5c3443d24399acb675e68278d341f
|
||||
download_extract "https://github.com/nlohmann/json/releases/download/v${JSON_VERSION}/json.tar.xz" json d6c65aca6b1ed68e7a182f4757257b107ae403032760ed6ef121c9d55e81757d
|
||||
cmake_install -DJSON_BuildTests=OFF
|
||||
popd
|
||||
|
||||
|
@ -60,7 +60,7 @@ EOF
|
|||
popd
|
||||
|
||||
info "boost ${BOOST_VERSION}"
|
||||
download_extract "https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION//\./_}.tar.gz" "boost_${BOOST_VERSION//\./_}" c0685b68dd44cc46574cce86c4e17c0f611b15e195be9848dfd0769a0a207628
|
||||
download_extract "https://github.com/boostorg/boost/releases/download/boost-1.84.0/boost-1.84.0.tar.xz" "boost-${BOOST_VERSION}" 2e64e5d79a738d0fa6fb546c6e5c2bd28f88d268a2a080546f74e5ff98f29d0e
|
||||
# Boost use its own ad-hoc build system
|
||||
# we only enable what yuzu needs
|
||||
./bootstrap.sh --with-libraries=context,container,system,headers
|
||||
|
|
|
@ -24,25 +24,26 @@ jobs:
|
|||
- linux/amd64
|
||||
- linux/arm64
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/checkout@v4
|
||||
- name: Create Docker Image Label
|
||||
id: meta
|
||||
uses: docker/metadata-action@v4
|
||||
uses: docker/metadata-action@v5
|
||||
with:
|
||||
images: ${{ env.REGISTRY_IMAGE }}
|
||||
tags: type=raw,value=latest,enable={{is_default_branch}}
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v2
|
||||
uses: docker/setup-qemu-action@v3
|
||||
- name: Set up Docker BuildX
|
||||
uses: docker/setup-buildx-action@v2
|
||||
uses: docker/setup-buildx-action@v3
|
||||
- name: Login to DockerHub
|
||||
uses: docker/login-action@v2
|
||||
uses: docker/login-action@v3
|
||||
if: (github.ref == 'refs/heads/master') && (github.repository == 'yuzu-emu/yuzu-multiplayer-dedicated')
|
||||
with:
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
- name: Build Image
|
||||
id: build
|
||||
uses: docker/build-push-action@v4
|
||||
uses: docker/build-push-action@v5
|
||||
with:
|
||||
platforms: ${{ matrix.platform }}
|
||||
push: ${{ (github.ref == 'refs/heads/master') && (github.repository == 'yuzu-emu/yuzu-multiplayer-dedicated') }}
|
||||
|
@ -51,11 +52,13 @@ jobs:
|
|||
run: |
|
||||
mkdir -p /tmp/digests
|
||||
digest="${{ steps.build.outputs.digest }}"
|
||||
cache_name="digests-${{ matrix.platform }}"
|
||||
echo "CACHE_NAME=${cache_name/\//-}" >> $GITHUB_ENV
|
||||
touch "/tmp/digests/${digest#sha256:}"
|
||||
- name: Upload digest
|
||||
uses: actions/upload-artifact@v3
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: digests
|
||||
name: ${{ env.CACHE_NAME }}
|
||||
path: /tmp/digests/*
|
||||
if-no-files-found: error
|
||||
retention-days: 1
|
||||
|
@ -66,19 +69,21 @@ jobs:
|
|||
- build
|
||||
steps:
|
||||
- name: Download digests
|
||||
uses: actions/download-artifact@v3
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: digests
|
||||
pattern: digests-*
|
||||
path: /tmp/digests
|
||||
merge-multiple: true
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v2
|
||||
uses: docker/setup-buildx-action@v3
|
||||
- name: Create Docker Image Label
|
||||
id: meta
|
||||
uses: docker/metadata-action@v4
|
||||
uses: docker/metadata-action@v5
|
||||
with:
|
||||
images: ${{ env.REGISTRY_IMAGE }}
|
||||
tags: type=raw,value=latest,enable={{is_default_branch}}
|
||||
- name: Login to Docker Hub
|
||||
uses: docker/login-action@v2
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# syntax=docker/dockerfile:1.3
|
||||
ARG UBUNTU_RELEASE=23.04
|
||||
ARG UBUNTU_RELEASE=23.10
|
||||
ARG USER=ubuntu UID=101 GROUP=ubuntu GID=101
|
||||
|
||||
### BOILERPLATE BEGIN ###
|
||||
|
@ -54,7 +54,8 @@ RUN chisel cut --release /opt/chisel-releases --root /rootfs \
|
|||
libc6_libs \
|
||||
libssl3_libs \
|
||||
libstdc++6_libs \
|
||||
openssl_config
|
||||
openssl_config \
|
||||
openssl_data
|
||||
|
||||
FROM image-prep AS final
|
||||
COPY --from=sliced-deps /rootfs /
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 432376920da73e5bb1dc3462c9e92c88607f7d75 Mon Sep 17 00:00:00 2001
|
||||
From 275b6282c3c9bd14cbaa7fe13c0be0c342a80c55 Mon Sep 17 00:00:00 2001
|
||||
From: liushuyu <liushuyu011@gmail.com>
|
||||
Date: Mon, 15 Aug 2022 23:32:31 -0600
|
||||
Subject: [PATCH] build: bypass extra dependency checks
|
||||
|
@ -10,10 +10,10 @@ Subject: [PATCH] build: bypass extra dependency checks
|
|||
3 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
|
||||
index 1f7cd598e..649b23ae9 100644
|
||||
index 9eebc7d65..a66f4373b 100644
|
||||
--- a/externals/CMakeLists.txt
|
||||
+++ b/externals/CMakeLists.txt
|
||||
@@ -128,7 +128,7 @@ endif()
|
||||
@@ -139,7 +139,7 @@ endif()
|
||||
|
||||
# FFMpeg
|
||||
if (YUZU_USE_BUNDLED_FFMPEG)
|
||||
|
@ -23,10 +23,10 @@ index 1f7cd598e..649b23ae9 100644
|
|||
set(FFmpeg_LDFLAGS "${FFmpeg_LDFLAGS}" PARENT_SCOPE)
|
||||
set(FFmpeg_LIBRARIES "${FFmpeg_LIBRARIES}" PARENT_SCOPE)
|
||||
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt
|
||||
index 9b13ccbab..c4a5c25f6 100644
|
||||
index cf9266d54..bef40788c 100644
|
||||
--- a/src/video_core/CMakeLists.txt
|
||||
+++ b/src/video_core/CMakeLists.txt
|
||||
@@ -284,9 +284,9 @@ create_target_directory_groups(video_core)
|
||||
@@ -290,9 +290,9 @@ create_target_directory_groups(video_core)
|
||||
target_link_libraries(video_core PUBLIC common core)
|
||||
target_link_libraries(video_core PUBLIC glad shader_recompiler stb bc_decoder)
|
||||
|
||||
|
@ -40,10 +40,10 @@ index 9b13ccbab..c4a5c25f6 100644
|
|||
target_include_directories(video_core PRIVATE ${FFmpeg_INCLUDE_DIR})
|
||||
target_link_libraries(video_core PRIVATE ${FFmpeg_LIBRARIES})
|
||||
diff --git a/src/video_core/host_shaders/CMakeLists.txt b/src/video_core/host_shaders/CMakeLists.txt
|
||||
index c4d459077..6354674db 100644
|
||||
index 6b912027f..a65022962 100644
|
||||
--- a/src/video_core/host_shaders/CMakeLists.txt
|
||||
+++ b/src/video_core/host_shaders/CMakeLists.txt
|
||||
@@ -65,9 +65,9 @@ set(SHADER_FILES
|
||||
@@ -68,9 +68,9 @@ set(SHADER_FILES
|
||||
)
|
||||
|
||||
find_program(GLSLANGVALIDATOR "glslangValidator")
|
||||
|
@ -55,7 +55,7 @@ index c4d459077..6354674db 100644
|
|||
+#endif()
|
||||
|
||||
set(GLSL_FLAGS "")
|
||||
set(QUIET_FLAG "--quiet")
|
||||
set(SPIR_V_VERSION "spirv1.3")
|
||||
--
|
||||
2.41.0
|
||||
2.42.0
|
||||
|
||||
|
|
Reference in New Issue