mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-08-04 15:19:47 +00:00
Merge branch 'master' into usb-handler-deref
This commit is contained in:
commit
35448bd70a
3 changed files with 4 additions and 11 deletions
|
@ -105,7 +105,7 @@ freebsd_task:
|
||||||
matrix:
|
matrix:
|
||||||
- name: Cirrus FreeBSD
|
- name: Cirrus FreeBSD
|
||||||
freebsd_instance:
|
freebsd_instance:
|
||||||
image_family: freebsd-13-4
|
image_family: freebsd-13-5
|
||||||
cpu: 8
|
cpu: 8
|
||||||
memory: 8G
|
memory: 8G
|
||||||
env:
|
env:
|
||||||
|
|
8
.github/workflows/rpcs3.yml
vendored
8
.github/workflows/rpcs3.yml
vendored
|
@ -5,15 +5,7 @@ defaults:
|
||||||
shell: bash
|
shell: bash
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
paths-ignore:
|
|
||||||
- '.cirrus.yml'
|
|
||||||
- '.azure-pipelines.yml'
|
|
||||||
- 'README.md'
|
|
||||||
pull_request:
|
pull_request:
|
||||||
paths-ignore:
|
|
||||||
- '.cirrus.yml'
|
|
||||||
- '.azure-pipelines.yml'
|
|
||||||
- 'README.md'
|
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
concurrency:
|
concurrency:
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
RPCS3
|
RPCS3
|
||||||
=====
|
=====
|
||||||
|
|
||||||
[](https://dev.azure.com/nekotekina/nekotekina/_build?definitionId=4&branchName=master)
|
[](https://dev.azure.com/nekotekina/nekotekina/_build?definitionId=8&_a=summary&repositoryFilter=4)
|
||||||
[](https://cirrus-ci.com/github/RPCS3/rpcs3)
|
[](https://cirrus-ci.com/github/RPCS3/rpcs3)
|
||||||
|
[](https://github.com/RPCS3/rpcs3/actions/workflows/rpcs3.yml)
|
||||||
[](https://discord.me/rpcs3)
|
[](https://discord.me/rpcs3)
|
||||||
|
|
||||||
The world's first free and open-source PlayStation 3 emulator/debugger, written in C++ for Windows, Linux, macOS and FreeBSD.
|
The world's first free and open-source PlayStation 3 emulator/debugger, written in C++ for Windows, Linux, macOS and FreeBSD.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue