From 5cffc95be63a6039be69abb13f36cca97718de3c Mon Sep 17 00:00:00 2001 From: GreemDev Date: Thu, 18 Dec 2025 03:01:10 -0600 Subject: [PATCH 1/3] Make all OSes build on Linux (7zip has a linux version) --- .github/workflows/canary.yml | 41 ++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index ba372c6bc..0a62c9aa9 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -30,8 +30,8 @@ jobs: strategy: matrix: platform: - - { name: win-x64, os: windows-latest, zip_os_name: win_x64 } - #- { name: win-arm64, os: windows-latest, zip_os_name: win_arm64 } + - { name: win-x64, os: ubuntu-latest, zip_os_name: win_x64 } + #- { name: win-arm64, os: ubuntu-latest, zip_os_name: win_arm64 } - { name: linux-x64, os: ubuntu-latest, zip_os_name: linux_x64 } - { name: linux-arm64, os: ubuntu-latest, zip_os_name: linux_arm64 } steps: @@ -44,6 +44,20 @@ jobs: - name: Overwrite csc problem matcher run: echo "::add-matcher::.github/csc.json" + - name: Install 7zip + run: | + sudo apt install -y 7zip + + - name: Install GitLabCli + run: | + mkdir -p $HOME/.bin + gh release download -R GreemDev/GLI -O gli -p 'GitLabCli-linux_x64' + chmod +x gli + mv gli $HOME/.bin/ + echo "$HOME/.bin" >> $GITHUB_PATH + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Get version info id: version_info run: | @@ -69,33 +83,20 @@ jobs: dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx --self-contained - name: Packing Windows builds - if: matrix.platform.os == 'windows-latest' + if: contains(matrix.platform.name, 'win') run: | pushd publish rm libarmeilleure-jitsupport.dylib - 7z a ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish + 7zz a ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish popd - gh release download -R GreemDev/GLI -O gli.exe -p 'GitLabCli-win_x64.exe' - - ./gli.exe --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=UploadGenericPackage "Ryubing-Canary|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip" + gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=UploadGenericPackage "Ryubing-Canary|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip" shell: bash env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Install GitLabCli - if: matrix.platform.os == 'ubuntu-latest' - run: | - mkdir -p $HOME/.bin - gh release download -R GreemDev/GLI -O gli -p 'GitLabCli-linux_x64' - chmod +x gli - mv gli $HOME/.bin/ - echo "$HOME/.bin" >> $GITHUB_PATH - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Packing Linux builds - if: matrix.platform.os == 'ubuntu-latest' + if: contains(matrix.platform.name, 'linux') run: | pushd publish rm libarmeilleure-jitsupport.dylib @@ -107,7 +108,7 @@ jobs: shell: bash - name: Build AppImage (Linux) - if: matrix.platform.os == 'ubuntu-latest' + if: contains(matrix.platform.name, 'linux') run: | BUILD_VERSION="${{ steps.version_info.outputs.build_version }}" PLATFORM_NAME="${{ matrix.platform.name }}" From 9f817d60d54263bb74f53e3d2412a3e4aec7b1d7 Mon Sep 17 00:00:00 2001 From: GreemDev Date: Thu, 18 Dec 2025 03:05:42 -0600 Subject: [PATCH 2/3] oops --- .github/workflows/canary.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index 0a62c9aa9..a62eb88cd 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -87,7 +87,7 @@ jobs: run: | pushd publish rm libarmeilleure-jitsupport.dylib - 7zz a ../release_output/ryujinx-canary-${{ 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 gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=UploadGenericPackage "Ryubing-Canary|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip" From 6cdbdfd329334352d1f9165a43ac4acdbd096cb4 Mon Sep 17 00:00:00 2001 From: GreemDev Date: Thu, 18 Dec 2025 03:27:34 -0600 Subject: [PATCH 3/3] [ci skip] Pin GitLabCli to 1.4.1 in CI scripts so I can test v2.0 --- .github/workflows/canary.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index a62eb88cd..7beb6e444 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -51,7 +51,7 @@ jobs: - name: Install GitLabCli run: | mkdir -p $HOME/.bin - gh release download -R GreemDev/GLI -O gli -p 'GitLabCli-linux_x64' + gh release download -R GreemDev/GLI -O gli -p 'GitLabCli-linux_x64' 1.4.1 chmod +x gli mv gli $HOME/.bin/ echo "$HOME/.bin" >> $GITHUB_PATH @@ -163,7 +163,7 @@ jobs: - name: Install GitLabCli run: | mkdir -p $HOME/.bin - gh release download -R GreemDev/GLI -O gli -p 'GitLabCli-linux_x64' + gh release download -R GreemDev/GLI -O gli -p 'GitLabCli-linux_x64' 1.4.1 chmod +x gli mv gli $HOME/.bin/ echo "$HOME/.bin" >> $GITHUB_PATH @@ -223,7 +223,7 @@ jobs: - name: Install GitLabCli run: | mkdir -p $HOME/.bin - gh release download -R GreemDev/GLI -O gli -p 'GitLabCli-linux_x64' + gh release download -R GreemDev/GLI -O gli -p 'GitLabCli-linux_x64' 1.4.1 chmod +x gli mv gli $HOME/.bin/ echo "$HOME/.bin" >> $GITHUB_PATH