Merge pull request #8 from Polarzincomfrio/master

Fixes to Actions
This commit is contained in:
ryzendew 2024-03-25 09:17:58 -03:00 committed by GitHub
commit 0c7c2704f0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 25 additions and 23 deletions

View File

@ -1,4 +1,4 @@
name: citra-build name: lime-build
on: on:
push: push:
@ -28,7 +28,7 @@ jobs:
matrix: matrix:
target: ["appimage", "fresh"] target: ["appimage", "fresh"]
container: container:
image: RyzenDew/build-environments:linux-${{ matrix.target }} image: polarzincomfrio/lime-build-environments:linux-${{ matrix.target }}
options: -u 1001 options: -u 1001
env: env:
CCACHE_DIR: ${{ github.workspace }}/.ccache CCACHE_DIR: ${{ github.workspace }}/.ccache
@ -126,10 +126,10 @@ jobs:
runs-on: windows-latest runs-on: windows-latest
strategy: strategy:
matrix: matrix:
target: ["msvc", "msys2"] target: ["msvc"] # Removing "msys2" from the target list
defaults: defaults:
run: run:
shell: ${{ (matrix.target == 'msys2' && 'msys2') || 'bash' }} {0} shell: bash {0} #shell: ${{ (matrix.target == 'msys2' && 'msys2') || 'bash' }} {0}
env: env:
CCACHE_DIR: ${{ github.workspace }}/.ccache CCACHE_DIR: ${{ github.workspace }}/.ccache
CCACHE_COMPILERCHECK: content CCACHE_COMPILERCHECK: content
@ -149,20 +149,20 @@ jobs:
${{ runner.os }}-${{ matrix.target }}- ${{ runner.os }}-${{ matrix.target }}-
- name: Set up MSVC - name: Set up MSVC
uses: ilammy/msvc-dev-cmd@v1 uses: ilammy/msvc-dev-cmd@v1
if: ${{ matrix.target == 'msvc' }} # if: ${{ matrix.target == 'msvc' }}
- name: Install extra tools (MSVC) - name: Install extra tools (MSVC)
run: choco install ccache ninja wget run: choco install ccache ninja wget
if: ${{ matrix.target == 'msvc' }} # if: ${{ matrix.target == 'msvc' }}
- name: Set up MSYS2 # - name: Set up MSYS2
uses: msys2/setup-msys2@v2 # uses: msys2/setup-msys2@v2
if: ${{ matrix.target == 'msys2' }} # if: ${{ matrix.target == 'msys2' }}
with: # with:
msystem: clang64 # msystem: clang64
update: true # update: true
install: git make p7zip # install: git make p7zip
pacboy: >- # pacboy: >-
toolchain:p ccache:p cmake:p ninja:p # toolchain:p ccache:p cmake:p ninja:p
qt6-base:p qt6-multimedia:p qt6-multimedia-wmf:p qt6-tools:p qt6-translations:p # qt6-base:p qt6-multimedia:p qt6-multimedia-wmf:p qt6-tools:p qt6-translations:p
- name: Disable line ending translation - name: Disable line ending translation
run: git config --global core.autocrlf input run: git config --global core.autocrlf input
- name: Build - name: Build

View File

@ -1,4 +1,4 @@
name: citra-format name: lime-format
on: on:
push: push:
@ -10,7 +10,7 @@ jobs:
clang-format: clang-format:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: container:
image: citraemu/build-environments:linux-fresh image: polarzincomfrio/lime-build-environments:linux-fresh
options: -u 1001 options: -u 1001
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4

View File

@ -1,4 +1,4 @@
name: citra-transifex name: lime-transifex
on: on:
push: push:
@ -7,8 +7,8 @@ on:
jobs: jobs:
transifex: transifex:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: RyzenDew/build-environments:linux-fresh container: polarzincomfrio/lime-build-environments:linux-fresh
if: ${{ github.repository == 'citra-emu/citra' }} if: ${{ github.repository == 'RyzenDew/Lime-3DS-Emulator' }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
@ -18,3 +18,4 @@ jobs:
run: ./.ci/transifex.sh run: ./.ci/transifex.sh
env: env:
TX_TOKEN: ${{ secrets.TRANSIFEX_API_TOKEN }} TX_TOKEN: ${{ secrets.TRANSIFEX_API_TOKEN }}
# This will never build until there's a Transifex API TOKEN available

2
.gitignore vendored
View File

@ -47,4 +47,4 @@ repo/
# GitHub Actions generated files # GitHub Actions generated files
.ccache/ .ccache/
node_modules/ node_modules/
VULKAN_SDK/ VULKAN_SDK/

View File

@ -362,7 +362,8 @@ void GSP_GPU::SignalInterruptForThread(InterruptId interrupt_id, u32 thread_id)
auto* info = GetFrameBufferInfo(thread_id, screen_id); auto* info = GetFrameBufferInfo(thread_id, screen_id);
if (info->is_dirty) { if (info->is_dirty) {
system.GPU().SetBufferSwap(screen_id, info->framebuffer_info[info->index]); system.GPU().SetBufferSwap(screen_id, info->framebuffer_info[info->index]);
// Decompiling the GSP module shows that the dirty bit is assigned 1 for top screen, 0 for bottom // Decompiling the GSP module shows that the dirty bit is assigned 1 for top screen, 0
// for bottom
info->is_dirty.Assign(screen_id == 0); info->is_dirty.Assign(screen_id == 0);
} }
} }