Skip to content

Commit

Permalink
Merge branch 'master' into stella
Browse files Browse the repository at this point in the history
  • Loading branch information
SergioMartin86 authored Aug 11, 2024
2 parents 57a9673 + ab7f379 commit 0daff4a
Show file tree
Hide file tree
Showing 1,760 changed files with 36,309 additions and 37,308 deletions.
13 changes: 13 additions & 0 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"version": 1,
"isRoot": true,
"tools": {
"powershell": {
"version": "7.4.2",
"commands": [
"pwsh"
],
"rollForward": false
}
}
}
2 changes: 2 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ dotnet_diagnostic.IDE0250.severity = suggestion
dotnet_diagnostic.IDE0260.severity = suggestion
# Use nameof
dotnet_diagnostic.IDE0280.severity = error
# Collection initialization can be simplified
dotnet_diagnostic.IDE0305.severity = silent

csharp_style_var_when_type_is_apparent = true
csharp_style_var_elsewhere = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ assignees: ''
[//]: # "This description supports Markdown syntax. There's a cheatsheet here: https://guides.github.com/features/mastering-markdown/"
[//]: # "These lines are comments, for letting you know what you should be writing. You can delete them or leave them in."
[//]: # "Also, please don't waste your time writing until you've checked for similar Issues. Remember to check closed Issues too!"
[//]: # "One more thing: if you're on Linux, please comment on #1430 instead of opening an issue so we don't annoy the other devs."

### Summary
[//]: # "Briefly describe what's broken. Include relevant details: loaded core, loaded rom's hash, open tools, running scripts... You can embed a screenshot if it's easier to show the bug, but if you need more than one please put them at the end."
Expand Down
File renamed without changes.
3 changes: 0 additions & 3 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ contact_links:
- name: "BEFORE OPENING AN ISSUE: Search for duplicates"
url: "https://github.com/TASVideos/BizHawk/issues?q=is:issue+<search+terms>"
about: "Use `is:issue <search terms>` to find open or closed issues that might be similar to your problem. (Clicking this option takes you back to the issue tracker index.)"
- name: "Report issues with the Linux port"
url: "https://github.com/TASVideos/BizHawk/issues/1430"
about: "Linux users: please comment here, on #1430, instead of opening a new issue."
- name: "Chat with us on IRC"
url: "https://matrix.to/#/#bizhawk:libera.chat"
about: "Joins #bizhawk on Libera Chat with your browser. Please be patient as there isn't always somebody online."
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
[//]: # "Apart from the mandatory license signature, these tasks are optional, but doing them could save reviewers some time and get the PR merged sooner."
Check if completed:
- [ ] I have run any relevant test suites
- [ ] I, the committer, have read the [licensing terms for contributors](https://github.com/TASEmulators/BizHawk/blob/master/contributing.md#copyrights-and-licensing) (last updated 2024-03-20) and am compliant
- [ ] I, the committer, have read the [licensing terms for contributors](https://github.com/TASEmulators/BizHawk/blob/master/contributing.md#copyrights-and-licensing) (last updated 2024-06-22) and am compliant
78 changes: 78 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
on: [push, pull_request, workflow_dispatch]
name: Build and test main solution

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
analyzer-build:
name: Build solution with analyzers
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Install .NET 8
uses: actions/setup-dotnet@v4
with:
dotnet-version: "8"

- name: Debug build with analyzers
run: Dist/BuildDebug.sh -warnaserror -p:RunAnalyzersDuringBuild=true

- name: Release build with analyzers
run: Dist/BuildRelease.sh -warnaserror -p:RunAnalyzersDuringBuild=true

test:
name: Test
runs-on: ${{matrix.os.fullname}}
strategy:
fail-fast: false
matrix:
os:
- { prettyname: Windows, fullname: windows-latest }
- { prettyname: Linux, fullname: ubuntu-latest }
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Install .NET 8
uses: actions/setup-dotnet@v4
with:
dotnet-version: "8"

- name: Test
run: dotnet test BizHawk.sln -c Release -p:ContinuousIntegrationBuild=true
shell: pwsh

package:
name: Build and package output
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Install .NET 8
uses: actions/setup-dotnet@v4
with:
dotnet-version: "8"

- name: Build solution
run: Dist/BuildRelease.sh

- name: Package (Linux)
run: Dist/Package.sh
- name: Upload Linux dev build
uses: actions/upload-artifact@v4
with:
name: BizHawk-dev-linux
path: packaged_output

- name: Package (Windows)
run: Dist/Package.sh windows-x64
- name: Upload Windows dev build
uses: actions/upload-artifact@v4
with:
name: BizHawk-dev-windows
path: packaged_output
157 changes: 157 additions & 0 deletions .github/workflows/make.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
name: Build Emulation Cores

on:
pull_request:
branches: [ "master" ]
paths: [ "waterbox/**" ]
push:
branches: [ "master" ]
paths: [ "waterbox/**" ]
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

env:
CC: clang-18

jobs:

build-waterbox:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Installing clang 18
run: wget https://apt.llvm.org/llvm.sh;
chmod u+x llvm.sh;
sudo ./llvm.sh 18;
clang-18 --version;
- name: Getting submodule(s)
working-directory: ./waterbox/
run: git submodule update --init musl
- name: Building musl
working-directory: ./waterbox/musl
run: ./wbox_configure.sh;
./wbox_build.sh;
- name: Building libcxx
working-directory: ./waterbox/libcxx
run: ./do-everything.sh
- name: Building nyma
working-directory: ./waterbox/nyma
run: ./build-and-install-zlib.sh
- name: Uploading compiled waterbox
uses: actions/upload-artifact@v4
with:
name: compiled-waterbox
path: waterbox/sysroot

build-waterboxed-cores:
runs-on: ubuntu-latest
needs: build-waterbox
steps:
- uses: actions/checkout@v4
- name: Getting submodule(s)
working-directory: ./waterbox/
run: git submodule update --init snes9x;
git submodule update --init melon/melonDS;
git submodule update --init nyma/mednafen;
git submodule update --init ares64/ares/thirdparty/angrylion-rdp;
git submodule update --init gpgx/Genesis-Plus-GX;
git submodule update --init ../submodules/sameboy/libsameboy;
git submodule update --init uae/libretro-uae;
- name: Download compiled waterbox
uses: actions/download-artifact@v4
with:
name: compiled-waterbox
path: waterbox/sysroot
- name: Installing clang 18
run: wget https://apt.llvm.org/llvm.sh;
chmod u+x llvm.sh;
sudo ./llvm.sh 18;
clang-18 --version;
- name: Giving execution permission to compiler
working-directory: ./waterbox/sysroot
run: chmod u+x bin/*
- name: Building cores
working-directory: ./waterbox/
run: ./make-all-cores.sh install
- name: Upload waterbox cores
uses: actions/upload-artifact@v4
with:
name: waterbox-cores
path: |
Assets/dll/ares64_interpreter.wbx.zst
Assets/dll/ares64_recompiler.wbx.zst
Assets/dll/bsnes.wbx.zst
Assets/dll/faust.wbx.zst
Assets/dll/gpgx.wbx.zst
Assets/dll/hyper.wbx.zst
Assets/dll/libsnes.wbx.zst
Assets/dll/melonDS.wbx.zst
Assets/dll/ngp.wbx.zst
Assets/dll/pcfx.wbx.zst
Assets/dll/picodrive.wbx.zst
Assets/dll/puae.wbx.zst
Assets/dll/shock.wbx.zst
Assets/dll/snes9x.wbx.zst
Assets/dll/ss.wbx.zst
Assets/dll/tic80.wbx.zst
Assets/dll/turbo.wbx.zst
Assets/dll/uzem.wbx.zst
Assets/dll/vb.wbx.zst
Assets/dll/virtualjaguar.wbx.zst
build-mame:
runs-on: ubuntu-latest
needs: build-waterbox
steps:
- uses: actions/checkout@v4
- name: Getting submodule(s)
working-directory: ./waterbox/
run: git submodule update --init mame-arcade/mame
- name: Download compiled waterbox
uses: actions/download-artifact@v4
with:
name: compiled-waterbox
path: waterbox/sysroot
- name: Installing clang 18
run: wget https://apt.llvm.org/llvm.sh;
chmod u+x llvm.sh;
sudo ./llvm.sh 18;
clang-18 --version;
- name: Giving execution permission to compiler
working-directory: ./waterbox/sysroot
run: chmod u+x bin/*
- name: Build emulibc
working-directory: ./waterbox/emulibc
run: make -j4
- name: Build libco
working-directory: ./waterbox/libco
run: make -j4
- name: Building MAME
working-directory: ./waterbox/mame-arcade
run: make -j4 install
- name: Upload mame core
uses: actions/upload-artifact@v4
with:
name: mame-core
path: |
Assets/dll/libmamearcade.wbx.zst
build-quickernes:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Getting submodule(s)
working-directory: ./quicknes
run: git submodule update --recursive --init core
- name: Building QuickerNES core (Linux)
working-directory: ./quicknes/make
run: make -j4; make install
- name: Upload quicknes core
uses: actions/upload-artifact@v4
with:
name: quicknes-core
path: |
Assets/dll/libquicknes.so
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ UpgradeLog.htm
*.opendb

/Dist/*.zip
/Dist/git_hooks/*.local.ps1

# mupen64plus-win32-deps is a submodule, so ignores should be in that repo
/libmupen64plus/mupen64plus-win32-deps/SDL-1.2.14/docs
Expand Down
3 changes: 1 addition & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,7 @@ run_tests:
- job: build_asms_release
artifacts: false
script:
- Dist/BuildDebug.sh # populate output
- Dist/BuildTestRelease.sh -v normal
- Dist/BuildTestRelease.sh -v normal -p:TestProjTargetFrameworkOverride=net8.0
stage: test

.disabled_job_sast:
Expand Down
7 changes: 4 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@
[submodule "submodules/gambatte"]
path = submodules/gambatte
url = https://github.com/pokemon-speedrunning/gambatte-core.git
[submodule "waterbox/llvm-project"]
path = waterbox/llvm-project
url = https://github.com/llvm/llvm-project.git
[submodule "submodules/libdarm"]
path = submodules/libdarm
url = https://github.com/jbremer/darm.git
Expand Down Expand Up @@ -81,3 +78,7 @@
path = waterbox/stella/core
url = https://github.com/TASEmulators/stella.git
branch = tasvideos-1
[submodule "waterbox/uae/libretro-uae"]
path = waterbox/uae/libretro-uae
url = https://github.com/TASEmulators/libretro-uae.git
branch = wbx
Loading

0 comments on commit 0daff4a

Please sign in to comment.