From 67bc7a6dea262b3834593631095a250ec64877b6 Mon Sep 17 00:00:00 2001 From: ascpixi <44982772+ascpixi@users.noreply.github.com> Date: Tue, 5 Mar 2024 01:25:36 +0100 Subject: [PATCH] Update code references to `yuzu-emu` User display strings have not been changed for the sake of parity. --- .ci/scripts/linux/docker.sh | 2 +- .ci/scripts/linux/upload.sh | 2 +- .ci/scripts/merge/apply-patches-by-label.py | 4 ++-- .github/workflows/android-merge.js | 8 ++++---- CMakeLists.txt | 4 ++-- CMakeModules/DownloadExternals.cmake | 2 +- CONTRIBUTING.md | 2 +- src/yuzu/main.cpp | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.ci/scripts/linux/docker.sh b/.ci/scripts/linux/docker.sh index 7bba01d62..c5751ce9e 100755 --- a/.ci/scripts/linux/docker.sh +++ b/.ci/scripts/linux/docker.sh @@ -51,7 +51,7 @@ rm -vf AppDir/usr/bin/yuzu-cmd AppDir/usr/bin/yuzu-tester # Download tools needed to build an AppImage wget -nc https://raw.githubusercontent.com/yuzu-emu/ext-linux-bin/main/appimage/deploy-linux.sh wget -nc https://raw.githubusercontent.com/yuzu-emu/AppImageKit-checkrt/old/AppRun.sh -wget -nc https://github.com/yuzu-emu/ext-linux-bin/raw/main/appimage/exec-x86_64.so +wget -nc https://github.com/yuzu-mirror/ext-linux-bin/raw/main/appimage/exec-x86_64.so # Set executable bit chmod 755 \ deploy-linux.sh \ diff --git a/.ci/scripts/linux/upload.sh b/.ci/scripts/linux/upload.sh index fbb2d9c1b..f26270c34 100755 --- a/.ci/scripts/linux/upload.sh +++ b/.ci/scripts/linux/upload.sh @@ -27,7 +27,7 @@ fi # Build an AppImage cd build -wget -nc https://github.com/yuzu-emu/ext-linux-bin/raw/main/appimage/appimagetool-x86_64.AppImage +wget -nc https://github.com/yuzu-mirror/ext-linux-bin/raw/main/appimage/appimagetool-x86_64.AppImage chmod 755 appimagetool-x86_64.AppImage # if FUSE is not available, then fallback to extract and run diff --git a/.ci/scripts/merge/apply-patches-by-label.py b/.ci/scripts/merge/apply-patches-by-label.py index 17bb7dc13..e2b345aea 100644 --- a/.ci/scripts/merge/apply-patches-by-label.py +++ b/.ci/scripts/merge/apply-patches-by-label.py @@ -15,7 +15,7 @@ def check_individual(labels): return False def do_page(page): - url = f"https://api.github.com/repos/yuzu-emu/yuzu/pulls?page={page}" + url = f"https://api.github.com/repos/yuzu-mirror/yuzu/pulls?page={page}" response = requests.get(url) response.raise_for_status() if (response.ok): @@ -26,7 +26,7 @@ def do_page(page): if (check_individual(pr["labels"])): pn = pr["number"] print(f"Matched PR# {pn}") - print(subprocess.check_output(["git", "fetch", "https://github.com/yuzu-emu/yuzu.git", f"pull/{pn}/head:pr-{pn}", "-f", "--no-recurse-submodules"])) + print(subprocess.check_output(["git", "fetch", "https://github.com/yuzu-mirror/yuzu.git", f"pull/{pn}/head:pr-{pn}", "-f", "--no-recurse-submodules"])) print(subprocess.check_output(["git", "merge", "--squash", f"pr-{pn}"])) print(subprocess.check_output(["git", "commit", f"-m\"Merge {tagline} PR {pn}\""])) diff --git a/.github/workflows/android-merge.js b/.github/workflows/android-merge.js index 315f81ba0..e9cbef7d3 100644 --- a/.github/workflows/android-merge.js +++ b/.github/workflows/android-merge.js @@ -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/yuzu-emu/yuzu-android.git"]); + await execa("git", ["remote", "add", "android", "https://github.com/yuzu-mirror/yuzu-android.git"]); await execa("git", ["fetch", "android"]); await execa("git", ['tag', newTag]); @@ -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/yuzu-emu/yuzu.git"]); + await execa("git", ["remote", "add", "source", "https://github.com/yuzu-mirror/yuzu.git"]); await execa("git", ["fetch", "source"]); const process1 = await execa("git", ["rev-parse", "source/master"]); const headCommit = process1.stdout; @@ -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/yuzu-emu/yuzu-android.git"]); + await execa("git", ["remote", "add", "mainline", "https://github.com/yuzu-mirror/yuzu-android.git"]); await execa("git", ["fetch", "mainline", "--tags"]); await execa("git", ["checkout", `tags/android-${MAINLINE_TAG}`]); await execa("git", ["submodule", "update", "--init", "--recursive"]); @@ -300,7 +300,7 @@ async function mergebot(github, context, execa) { } console.info("The following pull requests will be merged:"); console.table(displayList); - await fetchPullRequests(pulls, "https://github.com/yuzu-emu/yuzu", execa); + await fetchPullRequests(pulls, "https://github.com/yuzu-mirror/yuzu", execa); const mergeResults = await mergePullRequests(pulls, execa); if (BUILD_EA) { diff --git a/CMakeLists.txt b/CMakeLists.txt index d460f1f7d..8c35b2229 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,7 +126,7 @@ if (YUZU_USE_BUNDLED_VCPKG) set(VCPKG_DOWNLOADS_PATH ${PROJECT_SOURCE_DIR}/externals/vcpkg/downloads) set(NASM_VERSION "2.16.01") set(NASM_DESTINATION_PATH ${VCPKG_DOWNLOADS_PATH}/nasm-${NASM_VERSION}-win64.zip) - set(NASM_DOWNLOAD_URL "https://github.com/yuzu-emu/ext-windows-bin/raw/master/nasm/nasm-${NASM_VERSION}-win64.zip") + set(NASM_DOWNLOAD_URL "https://github.com/yuzu-mirror/ext-windows-bin/raw/master/nasm/nasm-${NASM_VERSION}-win64.zip") if (NOT EXISTS ${NASM_DESTINATION_PATH}) file(DOWNLOAD ${NASM_DOWNLOAD_URL} ${NASM_DESTINATION_PATH} SHOW_PROGRESS STATUS NASM_STATUS) @@ -620,7 +620,7 @@ if (NOT CLANG_FORMAT) message(STATUS "Clang format not found! Downloading...") set(CLANG_FORMAT "${PROJECT_BINARY_DIR}/externals/clang-format${CLANG_FORMAT_POSTFIX}.exe") file(DOWNLOAD - https://github.com/yuzu-emu/ext-windows-bin/raw/master/clang-format${CLANG_FORMAT_POSTFIX}.exe + https://github.com/yuzu-mirror/ext-windows-bin/raw/master/clang-format${CLANG_FORMAT_POSTFIX}.exe "${CLANG_FORMAT}" SHOW_PROGRESS STATUS DOWNLOAD_SUCCESS) if (NOT DOWNLOAD_SUCCESS EQUAL 0) diff --git a/CMakeModules/DownloadExternals.cmake b/CMakeModules/DownloadExternals.cmake index a52148bd8..d22e021e8 100644 --- a/CMakeModules/DownloadExternals.cmake +++ b/CMakeModules/DownloadExternals.cmake @@ -7,7 +7,7 @@ # prefix_var: name of a variable which will be set with the path to the extracted contents function(download_bundled_external remote_path lib_name prefix_var) -set(package_base_url "https://github.com/yuzu-emu/") +set(package_base_url "https://github.com/yuzu-mirror/") set(package_repo "no_platform") set(package_extension "no_platform") if (WIN32) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1860f8cff..12651c24a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,4 +3,4 @@ SPDX-FileCopyrightText: 2018 yuzu Emulator Project SPDX-License-Identifier: GPL-2.0-or-later --> -**The Contributor's Guide has moved to [the yuzu wiki](https://github.com/yuzu-emu/yuzu/wiki/Contributing).** +**The Contributor's Guide has moved to [the yuzu wiki](https://github.com/yuzu-mirror/yuzu/wiki/Contributing).** diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index c0c0a19b8..56013f0f3 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -3583,7 +3583,7 @@ void GMainWindow::OpenURL(const QUrl& url) { } void GMainWindow::OnOpenModsPage() { - OpenURL(QUrl(QStringLiteral("https://github.com/yuzu-emu/yuzu/wiki/Switch-Mods"))); + OpenURL(QUrl(QStringLiteral("https://github.com/yuzu-mirror/yuzu/wiki/Switch-Mods"))); } void GMainWindow::OnOpenQuickstartGuide() {