Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add more mentions of canary #258

Merged
merged 34 commits into from
Nov 21, 2024
Merged

Add more mentions of canary #258

Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
e474879
Added more mentions of canary
GabCoolDude Nov 16, 2024
75a4403
Added canary in canary logs
GabCoolDude Nov 17, 2024
eba93a3
Attempt to fix macos canary workflows
GabCoolDude Nov 17, 2024
2c9e593
Merge branch 'GreemDev:master' into canarymention
GabCoolDude Nov 17, 2024
8dd78b4
Changed `Ryujinx Canary` to `Ryujinx_Canary` to follow nearby formatt…
GabCoolDude Nov 17, 2024
ef78e1b
Merge remote-tracking branch 'origin/canarymention' into canarymention
GabCoolDude Nov 17, 2024
82cf5c8
Merge branch 'master' into canarymention
GreemDev Nov 19, 2024
8cbcf15
Change headless to nogui
GabCoolDude Nov 20, 2024
294507a
Merge remote-tracking branch 'origin/canarymention' into canarymention
GabCoolDude Nov 20, 2024
a241dc4
Merge branch 'master' into canarymention
GabCoolDude Nov 20, 2024
fbd9a44
zfaazfqsf
GabCoolDude Nov 20, 2024
f6d4580
Attempt to check if canary in `create_macos_build_ava.sh` and in `cre…
GabCoolDude Nov 20, 2024
77fc934
Attempt to check if canary in `create_macos_build_ava.sh` and in `cre…
GabCoolDude Nov 20, 2024
c3631dc
attempt 2
GabCoolDude Nov 20, 2024
2064436
Merge remote-tracking branch 'origin/canarymention' into canarymention
GabCoolDude Nov 20, 2024
3a1c884
Fix faulty if statement formatting
GabCoolDude Nov 21, 2024
de1d29e
Replace `&&` op with `||` to hopefully fix macos artifacts's names, a…
GabCoolDude Nov 21, 2024
467c3d0
Print canary var to try and see what's wrong
GabCoolDude Nov 21, 2024
fd8df4f
oops
GabCoolDude Nov 21, 2024
1f694aa
ubjkb
GabCoolDude Nov 21, 2024
58cfffd
HOPEFULLY I DID THIS RIGHT
GabCoolDude Nov 21, 2024
dfff0a1
AAAAAAAAAAA
GabCoolDude Nov 21, 2024
272197b
please for the love of capybaras
GabCoolDude Nov 21, 2024
a7e3404
i'm tired boss
GabCoolDude Nov 21, 2024
fa64ce7
aaaaa
GabCoolDude Nov 21, 2024
e694afe
maybe i should stop naming my commits like this but im tired
GabCoolDude Nov 21, 2024
9e2f381
added missing canary argument to launch options for macos
GabCoolDude Nov 21, 2024
1323b52
Final cleanup
GabCoolDude Nov 21, 2024
809d268
Remove left over canary bash files and fixed headless name artifacts …
GabCoolDude Nov 21, 2024
392c972
Remove left-over env variable
GabCoolDude Nov 21, 2024
953f997
Remove accidental using
GabCoolDude Nov 21, 2024
75d7214
Merge branch 'master' into canarymention
GabCoolDude Nov 21, 2024
7db165d
Changed headless from .app.tar to .tar just so it's what it was before
GabCoolDude Nov 21, 2024
0757b34
Merge remote-tracking branch 'origin/canarymention' into canarymention
GabCoolDude Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ env:
DOTNET_CLI_TELEMETRY_OPTOUT: 1
RYUJINX_BASE_VERSION: "1.2.0"
RELEASE: 0
CANARY: 0

jobs:
build:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/canary.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,12 @@ jobs:
run: |
pushd publish_ava
rm publish/libarmeilleure-jitsupport.dylib
7z a ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
7z a ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
popd

pushd publish_sdl2_headless
rm publish/libarmeilleure-jitsupport.dylib
7z a ../release_output/nogui-ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
7z a ../release_output/nogui-ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
popd
shell: bash

Expand All @@ -126,13 +126,13 @@ jobs:
pushd publish_ava
rm publish/libarmeilleure-jitsupport.dylib
chmod +x publish/Ryujinx.sh publish/Ryujinx
tar -czvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
tar -czvf ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
popd

pushd publish_sdl2_headless
rm publish/libarmeilleure-jitsupport.dylib
chmod +x publish/Ryujinx.sh publish/Ryujinx.Headless.SDL2
tar -czvf ../release_output/nogui-ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
tar -czvf ../release_output/nogui-ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
popd
shell: bash

Expand Down Expand Up @@ -236,11 +236,11 @@ jobs:

- name: Publish macOS Ryujinx
run: |
./distribution/macos/create_macos_build_ava.sh . publish_tmp_ava publish_ava ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release
./distribution/macos/create_macos_build_ava.sh . publish_tmp_ava publish_ava ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 1

- name: Publish macOS Ryujinx.Headless.SDL2
run: |
./distribution/macos/create_macos_build_headless.sh . publish_tmp_headless publish_headless ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release
./distribution/macos/create_macos_build_headless.sh . publish_tmp_headless publish_headless ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 1

- name: Pushing new release
uses: ncipollo/release-action@v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,11 +231,11 @@ jobs:

- name: Publish macOS Ryujinx
run: |
./distribution/macos/create_macos_build_ava.sh . publish_tmp_ava publish ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release
./distribution/macos/create_macos_build_ava.sh . publish_tmp_ava publish ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 0

- name: Publish macOS Ryujinx.Headless.SDL2
run: |
./distribution/macos/create_macos_build_headless.sh . publish_tmp_headless publish_headless ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release
./distribution/macos/create_macos_build_headless.sh . publish_tmp_headless publish_headless ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 0

- name: Pushing new release
uses: ncipollo/release-action@v1
Expand Down
13 changes: 7 additions & 6 deletions distribution/macos/create_macos_build_ava.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

set -e

if [ "$#" -lt 7 ]; then
echo "usage <BASE_DIR> <TEMP_DIRECTORY> <OUTPUT_DIRECTORY> <ENTITLEMENTS_FILE_PATH> <VERSION> <SOURCE_REVISION_ID> <CONFIGURATION> <EXTRA_ARGS>"
if [ "$#" -lt 8 ]; then
echo "usage <BASE_DIR> <TEMP_DIRECTORY> <OUTPUT_DIRECTORY> <ENTITLEMENTS_FILE_PATH> <VERSION> <SOURCE_REVISION_ID> <CONFIGURATION> <CANARY>"
exit 1
fi

Expand All @@ -18,10 +18,11 @@ ENTITLEMENTS_FILE_PATH=$(readlink -f "$4")
VERSION=$5
SOURCE_REVISION_ID=$6
CONFIGURATION=$7
EXTRA_ARGS=$8
CANARY=$8

if [ "$VERSION" == "1.1.0" ];
then
if [ "$CANARY" == "1" ]; then
RELEASE_TAR_FILE_NAME=ryujinx-canary-$VERSION-macos_universal.app.tar
elif [ "$VERSION" == "1.1.0" ]; then
RELEASE_TAR_FILE_NAME=ryujinx-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.app.tar
else
RELEASE_TAR_FILE_NAME=ryujinx-$VERSION-macos_universal.app.tar
Expand Down Expand Up @@ -61,7 +62,7 @@ mkdir -p "$OUTPUT_DIRECTORY"
cp -R "$ARM64_APP_BUNDLE" "$UNIVERSAL_APP_BUNDLE"
rm "$UNIVERSAL_APP_BUNDLE/$EXECUTABLE_SUB_PATH"

# Make it libraries universal
# Make its libraries universal
python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_APP_BUNDLE" "$X64_APP_BUNDLE" "$UNIVERSAL_APP_BUNDLE" "**/*.dylib"

if ! [ -x "$(command -v lipo)" ];
Expand Down
15 changes: 8 additions & 7 deletions distribution/macos/create_macos_build_headless.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

set -e

if [ "$#" -lt 7 ]; then
echo "usage <BASE_DIR> <TEMP_DIRECTORY> <OUTPUT_DIRECTORY> <ENTITLEMENTS_FILE_PATH> <VERSION> <SOURCE_REVISION_ID> <CONFIGURATION> <EXTRA_ARGS>"
if [ "$#" -lt 8 ]; then
echo "usage <BASE_DIR> <TEMP_DIRECTORY> <OUTPUT_DIRECTORY> <ENTITLEMENTS_FILE_PATH> <VERSION> <SOURCE_REVISION_ID> <CONFIGURATION> <CANARY>"
exit 1
fi

Expand All @@ -18,13 +18,14 @@ ENTITLEMENTS_FILE_PATH=$(readlink -f "$4")
VERSION=$5
SOURCE_REVISION_ID=$6
CONFIGURATION=$7
EXTRA_ARGS=$8
CANARY=$8

if [ "$VERSION" == "1.1.0" ];
then
RELEASE_TAR_FILE_NAME=nogui-ryujinx-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.tar
if [ "$CANARY" == "1" ]; then
RELEASE_TAR_FILE_NAME=nogui-ryujinx-canary-$VERSION-macos_universal.app.tar
elif [ "$VERSION" == "1.1.0" ]; then
RELEASE_TAR_FILE_NAME=nogui-ryujinx-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.app.tar
else
RELEASE_TAR_FILE_NAME=nogui-ryujinx-$VERSION-macos_universal.tar
RELEASE_TAR_FILE_NAME=nogui-ryujinx-$VERSION-macos_universal.app.tar
fi

ARM64_OUTPUT="$TEMP_DIRECTORY/publish_arm64"
Expand Down
4 changes: 3 additions & 1 deletion src/Ryujinx.Common/Logging/Targets/FileLogTarget.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System;
using System.IO;
using System.Linq;
using System.Net.Mime;
GabCoolDude marked this conversation as resolved.
Show resolved Hide resolved

namespace Ryujinx.Common.Logging.Targets
{
Expand Down Expand Up @@ -69,9 +70,10 @@ public static FileStream PrepareLogFile(string path)
}

string version = ReleaseInformation.Version;
string appName = ReleaseInformation.IsCanaryBuild ? "Ryujinx_Canary" : "Ryujinx";

// Get path for the current time
path = Path.Combine(logDir.FullName, $"Ryujinx_{version}_{DateTime.Now:yyyy-MM-dd_HH-mm-ss}.log");
path = Path.Combine(logDir.FullName, $"{appName}_{version}_{DateTime.Now:yyyy-MM-dd_HH-mm-ss}.log");

try
{
Expand Down
2 changes: 1 addition & 1 deletion src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public string Version

public AboutWindowViewModel()
{
Version = Program.Version;
Version = App.FullAppName + "\n" + Program.Version;
UpdateLogoTheme(ConfigurationState.Instance.UI.BaseStyle.Value);

ThemeManager.ThemeChanged += ThemeManager_ThemeChanged;
Expand Down