CCF_100/suyu-mirror
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/suyu synced 2025-12-09 22:32:08 -06:00
Code Issues Releases Wiki Activity

Revert "Merge branch 'master' into 'dev'"

Browse Source 
This reverts merge request !17
This commit is contained in:
Crimson Hawk
2024-03-06 05:26:38 +00:00
parent fdadc50fff
commit cdbdf63ebe
2887 changed files with 18295 additions and 18366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/android-build.yml vendored
View File

@@ -1,7 +1,7 @@
# SPDX-FileCopyrightText: 2022 suyu Emulator Project
# SPDX-FileCopyrightText: 2022 yuzu Emulator Project
# SPDX-License-Identifier: GPL-3.0-or-later
name: 'suyu-android-build'
name: 'yuzu-android-build'
on:
push:
@@ -10,7 +10,7 @@ on:
jobs:
android:
runs-on: ubuntu-latest
if: ${{ github.repository == 'suyu-emu/suyu-android' }}
if: ${{ github.repository == 'yuzu-emu/yuzu-android' }}
steps:
- uses: actions/checkout@v3
with:

8
.github/workflows/android-ea-play-release.yml vendored
View File

@@ -1,7 +1,7 @@
# SPDX-FileCopyrightText: 2024 suyu Emulator Project
# SPDX-FileCopyrightText: 2024 yuzu Emulator Project
# SPDX-License-Identifier: GPL-2.0-or-later
name: suyu-android-ea-play-release
name: yuzu-android-ea-play-release
on:
workflow_dispatch:
@@ -14,7 +14,7 @@ on:
jobs:
android:
runs-on: ubuntu-latest
if: ${{ github.repository == 'suyu-emu/suyu' }}
if: ${{ github.repository == 'yuzu-emu/yuzu' }}
steps:
- uses: actions/checkout@v3
name: Checkout
@@ -62,5 +62,5 @@ jobs:
name: ${{ env.EA_TAG_NAME }}
draft: false
prerelease: false
repository: suyu/suyu-android
repository: yuzu/yuzu-android
token: ${{ secrets.ALT_GITHUB_TOKEN }}

8
.github/workflows/android-mainline-play-release.yml vendored
View File

@@ -1,13 +1,13 @@
# SPDX-FileCopyrightText: 2024 suyu Emulator Project
# SPDX-FileCopyrightText: 2024 yuzu Emulator Project
# SPDX-License-Identifier: GPL-2.0-or-later
name: suyu-android-mainline-play-release
name: yuzu-android-mainline-play-release
on:
workflow_dispatch:
inputs:
release-tag:
description: 'Tag # from suyu-android that you want to build and publish'
description: 'Tag # from yuzu-android that you want to build and publish'
required: true
default: '200'
release-track:
@@ -18,7 +18,7 @@ on:
jobs:
android:
runs-on: ubuntu-latest
if: ${{ github.repository == 'suyu-emu/suyu' }}
if: ${{ github.repository == 'yuzu-emu/yuzu' }}
steps:
- uses: actions/checkout@v3
name: Checkout

34
.github/workflows/android-merge.js vendored
View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2023 suyu Emulator Project
// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
// Note: This is a GitHub Actions script
@@ -25,8 +25,8 @@ async function checkBaseChanges(github) {
}
}`;
const variables = {
owner: 'suyu-emu',
name: 'suyu',
owner: 'yuzu-emu',
name: 'yuzu',
ref: 'refs/heads/master',
};
const result = await github.graphql(query, variables);
@@ -126,7 +126,7 @@ async function tagAndPushEA(github, owner, repo, execa) {
const newTag = `ea-${tagNumber + 1}`;
console.log(`New tag: ${newTag}`);
console.info('Pushing tags to GitHub ...');
await execa("git", ["remote", "add", "android", "https://github.com/suyu-emu/suyu-android.git"]);
await execa("git", ["remote", "add", "android", "https://github.com/yuzu-emu/yuzu-android.git"]);
await execa("git", ["fetch", "android"]);
await execa("git", ['tag', newTag]);
@@ -174,12 +174,12 @@ async function fetchPullRequests(pulls, repoUrl, execa) {
async function mergePullRequests(pulls, execa) {
let mergeResults = {};
console.log("::group::Merge pull requests");
await execa("git", ["config", "--global", "user.name", "suyubot"]);
await execa("git", ["config", "--global", "user.name", "yuzubot"]);
await execa("git", [
"config",
"--global",
"user.email",
"suyu\x40suyu-emu\x2eorg", // prevent email harvesters from scraping the address
"yuzu\x40yuzu-emu\x2eorg", // prevent email harvesters from scraping the address
]);
let hasFailed = false;
for (let pull of pulls) {
@@ -195,7 +195,7 @@ async function mergePullRequests(pulls, execa) {
process1.stdout.pipe(process.stdout);
await process1;
const process2 = execa("git", ["commit", "-m", `Merge suyu-emu#${pr}`]);
const process2 = execa("git", ["commit", "-m", `Merge yuzu-emu#${pr}`]);
process2.stdout.pipe(process.stdout);
await process2;
@@ -224,7 +224,7 @@ async function resetBranch(execa) {
console.log("::group::Reset master branch");
let hasFailed = false;
try {
await execa("git", ["remote", "add", "source", "https://github.com/suyu-emu/suyu.git"]);
await execa("git", ["remote", "add", "source", "https://github.com/yuzu-emu/yuzu.git"]);
await execa("git", ["fetch", "source"]);
const process1 = await execa("git", ["rev-parse", "source/master"]);
const headCommit = process1.stdout;
@@ -251,16 +251,16 @@ async function getPulls(github) {
}
}`;
const mainlineVariables = {
owner: 'suyu-emu',
name: 'suyu',
owner: 'yuzu-emu',
name: 'yuzu',
label: CHANGE_LABEL_MAINLINE,
};
const mainlineResult = await github.graphql(query, mainlineVariables);
const pulls = mainlineResult.repository.pullRequests.nodes;
if (BUILD_EA) {
const eaVariables = {
owner: 'suyu-emu',
name: 'suyu',
owner: 'yuzu-emu',
name: 'yuzu',
label: CHANGE_LABEL_EA,
};
const eaResult = await github.graphql(query, eaVariables);
@@ -274,7 +274,7 @@ async function getMainlineTag(execa) {
console.log(`::group::Getting mainline tag android-${MAINLINE_TAG}`);
let hasFailed = false;
try {
await execa("git", ["remote", "add", "mainline", "https://github.com/suyu-emu/suyu-android.git"]);
await execa("git", ["remote", "add", "mainline", "https://github.com/yuzu-emu/yuzu-android.git"]);
await execa("git", ["fetch", "mainline", "--tags"]);
await execa("git", ["checkout", `tags/android-${MAINLINE_TAG}`]);
await execa("git", ["submodule", "update", "--init", "--recursive"]);
@@ -289,7 +289,7 @@ async function getMainlineTag(execa) {
}
async function mergebot(github, context, execa) {
// Reset our local copy of master to what appears on suyu-emu/suyu - master
// Reset our local copy of master to what appears on yuzu-emu/yuzu - master
await resetBranch(execa);
const pulls = await getPulls(github);
@@ -300,14 +300,14 @@ async function mergebot(github, context, execa) {
}
console.info("The following pull requests will be merged:");
console.table(displayList);
await fetchPullRequests(pulls, "https://github.com/suyu-emu/suyu", execa);
await fetchPullRequests(pulls, "https://github.com/yuzu-emu/yuzu", execa);
const mergeResults = await mergePullRequests(pulls, execa);
if (BUILD_EA) {
await tagAndPushEA(github, 'suyu-emu', `suyu-android`, execa);
await tagAndPushEA(github, 'yuzu-emu', `yuzu-android`, execa);
} else {
await generateReadme(pulls, context, mergeResults, execa);
await tagAndPush(github, 'suyu-emu', `suyu-android`, execa, true);
await tagAndPush(github, 'yuzu-emu', `yuzu-android`, execa, true);
}
}

10
.github/workflows/android-publish.yml vendored
View File

@@ -1,7 +1,7 @@
# SPDX-FileCopyrightText: 2024 suyu Emulator Project
# SPDX-FileCopyrightText: 2024 yuzu Emulator Project
# SPDX-License-Identifier: GPL-2.0-or-later
name: suyu-android-publish
name: yuzu-android-publish
on:
schedule:
@@ -16,7 +16,7 @@ on:
jobs:
android:
runs-on: ubuntu-latest
if: ${{ github.event.inputs.android != 'false' && github.repository == 'suyu-emu/suyu' }}
if: ${{ github.event.inputs.android != 'false' && github.repository == 'yuzu-emu/yuzu' }}
steps:
# this checkout is required to make sure the GitHub Actions scripts are available
- uses: actions/checkout@v3
@@ -40,7 +40,7 @@ jobs:
name: Checkout
if: ${{ steps.check-changes.outputs.result == 'true' }}
with:
path: 'suyu-merge'
path: 'yuzu-merge'
fetch-depth: 0
submodules: true
token: ${{ secrets.ALT_GITHUB_TOKEN }}
@@ -53,5 +53,5 @@ jobs:
script: |
const execa = require("execa");
const mergebot = require('./.github/workflows/android-merge.js').mergebot;
process.chdir('${{ github.workspace }}/suyu-merge');
process.chdir('${{ github.workspace }}/yuzu-merge');
mergebot(github, context, execa);

10
.github/workflows/ci.yml vendored
View File

@@ -1,7 +1,7 @@
# SPDX-FileCopyrightText: 2021 suyu Emulator Project
# SPDX-FileCopyrightText: 2021 yuzu Emulator Project
# SPDX-License-Identifier: GPL-2.0-or-later
name: suyu-ci
name: yuzu-ci
on:
push:
@@ -13,8 +13,8 @@ on:
jobs:
transifex:
runs-on: ubuntu-latest
container: suyuemu/build-environments:linux-transifex
if: ${{ github.repository == 'suyu-emu/suyu' && !github.head_ref }}
container: yuzuemu/build-environments:linux-transifex
if: ${{ github.repository == 'yuzu-emu/yuzu' && !github.head_ref }}
steps:
- uses: actions/checkout@v3
with:
@@ -27,7 +27,7 @@ jobs:
reuse:
runs-on: ubuntu-latest
if: ${{ github.repository == 'suyu-emu/suyu' }}
if: ${{ github.repository == 'yuzu-emu/yuzu' }}
steps:
- uses: actions/checkout@v3
- uses: fsfe/reuse-action@v1

2
.github/workflows/codespell.yml vendored
View File

@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2023 suyu Emulator Project
# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
# SPDX-License-Identifier: GPL-2.0-or-later
# GitHub Action to automate the identification of common misspellings in text files.
# https://github.com/codespell-project/actions-codespell

10
.github/workflows/verify.yml vendored
View File

@@ -1,7 +1,7 @@
# SPDX-FileCopyrightText: 2022 suyu Emulator Project
# SPDX-FileCopyrightText: 2022 yuzu Emulator Project
# SPDX-License-Identifier: GPL-3.0-or-later
name: 'suyu verify'
name: 'yuzu verify'
on:
pull_request:
@@ -39,7 +39,7 @@ jobs:
- type: windows
image: linux-mingw
container:
image: suyuemu/build-environments:${{ matrix.image }}
image: yuzuemu/build-environments:${{ matrix.image }}
options: -u 1001
steps:
- uses: actions/checkout@v3
@@ -87,7 +87,7 @@ jobs:
mkdir build
cd build
export Qt5_DIR="$(brew --prefix qt@5)/lib/cmake"
cmake .. -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -Dsuyu_USE_BUNDLED_VCPKG=OFF -Dsuyu_TESTS=OFF -DENABLE_WEB_SERVICE=OFF -DENABLE_LIBUSB=OFF
cmake .. -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DYUZU_USE_BUNDLED_VCPKG=OFF -DYUZU_TESTS=OFF -DENABLE_WEB_SERVICE=OFF -DENABLE_LIBUSB=OFF
ninja
build-msvc:
name: 'test build (windows, msvc)'
@@ -129,7 +129,7 @@ jobs:
run: |
glslangValidator --version
mkdir build
cmake . -B build -GNinja -DCMAKE_TOOLCHAIN_FILE="CMakeModules/MSVCCache.cmake" -DUSE_CCACHE=ON -Dsuyu_USE_BUNDLED_QT=1 -Dsuyu_USE_BUNDLED_SDL2=1 -Dsuyu_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -Dsuyu_ENABLE_COMPATIBILITY_REPORTING=ON -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DCMAKE_BUILD_TYPE=Release -DGIT_BRANCH=pr-verify -Dsuyu_CRASH_DUMPS=ON
cmake . -B build -GNinja -DCMAKE_TOOLCHAIN_FILE="CMakeModules/MSVCCache.cmake" -DUSE_CCACHE=ON -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_BUNDLED_SDL2=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=ON -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DCMAKE_BUILD_TYPE=Release -DGIT_BRANCH=pr-verify -DYUZU_CRASH_DUMPS=ON
- name: Build
run: cmake --build build
- name: Cache Summary