Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 0 additions & 21 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,6 @@ jobs:
compiler: clang
secrets: inherit

build_linux_x64_gcc:
name: "🐧 Linux x64 (GCC)"
uses: ./.github/workflows/linux_build.yml
with:
jobName: "Linux x64 GCC Build"
artifactPrefixName: "myMCpp-linux-x64-gcc"
platform: x64
compiler: gcc
secrets: inherit

build_linux_arm64_clang:
name: "🐧 Linux ARM64 (Clang)"
uses: ./.github/workflows/linux_build.yml
Expand All @@ -42,17 +32,6 @@ jobs:
compiler: clang
secrets: inherit

build_linux_arm64_gcc:
name: "🐧 Linux ARM64 (GCC)"
uses: ./.github/workflows/linux_build.yml
with:
jobName: "Linux ARM64 GCC Build"
artifactPrefixName: "myMCpp-linux-arm64-gcc"
os: ubuntu-24.04-arm
platform: arm64
compiler: gcc
secrets: inherit

build_macos:
name: "🍎 macOS"
uses: ./.github/workflows/macos_build.yml
Expand Down
31 changes: 4 additions & 27 deletions .github/workflows/linux_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ jobs:
run: |
sudo apt-get update
sudo apt-get -y install \
build-essential \
ccache \
clang \
lld \
Expand Down Expand Up @@ -147,15 +146,15 @@ jobs:
run: |
if [ "${{ inputs.buildType }}" = "Debug" ]; then
if [ "${{ inputs.platform }}" = "arm64" ]; then
PRESET="linux-arm64-dbg"
PRESET="linux-clang-arm64-dbg"
else
PRESET="linux-x64-dbg"
PRESET="linux-clang-x64-dbg"
fi
else
if [ "${{ inputs.platform }}" = "arm64" ]; then
PRESET="linux-arm64-rel"
PRESET="linux-clang-arm64-rel"
else
PRESET="linux-x64-rel"
PRESET="linux-clang-x64-rel"
fi
fi
echo "PRESET=$PRESET" >> $GITHUB_ENV
Expand All @@ -166,28 +165,6 @@ jobs:
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
${{ inputs.cmakeFlags }}

- name: Configure CMake (GCC)
if: inputs.compiler == 'gcc'
run: |
if [ "${{ inputs.buildType }}" = "Debug" ]; then
if [ "${{ inputs.platform }}" = "arm64" ]; then
PRESET="linux-arm64-gcc-dbg"
else
PRESET="linux-x64-gcc-dbg"
fi
else
if [ "${{ inputs.platform }}" = "arm64" ]; then
PRESET="linux-arm64-gcc-rel"
else
PRESET="linux-x64-gcc-rel"
fi
fi
echo "PRESET=$PRESET" >> $GITHUB_ENV
cmake --preset $PRESET \
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
${{ inputs.cmakeFlags }}

- name: Build
run: |
ccache -p
Expand Down
29 changes: 0 additions & 29 deletions .github/workflows/nightly_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,19 +79,6 @@ jobs:
fetchTags: true
secrets: inherit

build_linux_x64_gcc:
if: github.repository == 'PCSX2/myMCpp'
name: '🐧 Linux x64 (GCC, Nightly)'
needs: cut_release
uses: ./.github/workflows/linux_build.yml
with:
jobName: 'Linux x64 GCC Nightly Build'
artifactPrefixName: 'myMCpp-nightly-linux-x64-gcc'
platform: x64
compiler: gcc
fetchTags: true
secrets: inherit

build_linux_arm64_clang:
if: github.repository == 'PCSX2/myMCpp'
name: '🐧 Linux ARM64 (Clang, Nightly)'
Expand All @@ -106,20 +93,6 @@ jobs:
fetchTags: true
secrets: inherit

build_linux_arm64_gcc:
if: github.repository == 'PCSX2/myMCpp'
name: '🐧 Linux ARM64 (GCC, Nightly)'
needs: cut_release
uses: ./.github/workflows/linux_build.yml
with:
jobName: 'Linux ARM64 GCC Nightly Build'
artifactPrefixName: 'myMCpp-nightly-linux-arm64-gcc'
os: ubuntu-24.04-arm
platform: arm64
compiler: gcc
fetchTags: true
secrets: inherit

build_macos:
if: github.repository == 'PCSX2/myMCpp'
name: '🍎 macOS (Nightly)'
Expand Down Expand Up @@ -192,9 +165,7 @@ jobs:
needs:
- cut_release
- build_linux_x64_clang
- build_linux_x64_gcc
- build_linux_arm64_clang
- build_linux_arm64_gcc
- build_macos
- build_windows_x64_clang
- build_windows_x64_msvc
Expand Down
104 changes: 16 additions & 88 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@
}
},
{
"name": "linux-x64-rel",
"name": "linux-clang-x64-rel",
"displayName": "Linux x64 Release",
"description": "Release build for Linux x64 with Clang and Ninja",
"generator": "Ninja",
"binaryDir": "${sourceDir}/build/linux-x64-rel",
"binaryDir": "${sourceDir}/build/linux-clang-x64-rel",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "MinSizeRel",
"CMAKE_C_COMPILER": "clang",
Expand All @@ -85,11 +85,11 @@
}
},
{
"name": "linux-x64-dbg",
"name": "linux-clang-x64-dbg",
"displayName": "Linux x64 Debug",
"description": "Debug build for Linux x64 with Clang and Ninja",
"generator": "Ninja",
"binaryDir": "${sourceDir}/build/linux-x64-dbg",
"binaryDir": "${sourceDir}/build/linux-clang-x64-dbg",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_C_COMPILER": "clang",
Expand All @@ -98,37 +98,11 @@
}
},
{
"name": "linux-x64-gcc-rel",
"displayName": "Linux x64 GCC Release",
"description": "Release build for Linux x64 with GCC and Ninja",
"generator": "Ninja",
"binaryDir": "${sourceDir}/build/linux-x64-gcc-rel",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "MinSizeRel",
"CMAKE_C_COMPILER": "gcc",
"CMAKE_CXX_COMPILER": "g++",
"ENABLE_VULKAN": "ON"
}
},
{
"name": "linux-x64-gcc-dbg",
"displayName": "Linux x64 GCC Debug",
"description": "Debug build for Linux x64 with GCC and Ninja",
"generator": "Ninja",
"binaryDir": "${sourceDir}/build/linux-x64-gcc-dbg",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_C_COMPILER": "gcc",
"CMAKE_CXX_COMPILER": "g++",
"ENABLE_VULKAN": "ON"
}
},
{
"name": "linux-arm64-rel",
"name": "linux-clang-arm64-rel",
"displayName": "Linux ARM64 Release",
"description": "Release build for Linux ARM64 with Clang and Ninja",
"generator": "Ninja",
"binaryDir": "${sourceDir}/build/linux-arm64-rel",
"binaryDir": "${sourceDir}/build/linux-clang-arm64-rel",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "MinSizeRel",
"CMAKE_C_COMPILER": "clang",
Expand All @@ -137,44 +111,18 @@
}
},
{
"name": "linux-arm64-dbg",
"name": "linux-clang-arm64-dbg",
"displayName": "Linux ARM64 Debug",
"description": "Debug build for Linux ARM64 with Clang and Ninja",
"generator": "Ninja",
"binaryDir": "${sourceDir}/build/linux-arm64-dbg",
"binaryDir": "${sourceDir}/build/linux-clang-arm64-dbg",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_C_COMPILER": "clang",
"CMAKE_CXX_COMPILER": "clang++",
"ENABLE_VULKAN": "ON"
}
},
{
"name": "linux-arm64-gcc-rel",
"displayName": "Linux ARM64 GCC Release",
"description": "Release build for Linux ARM64 with GCC and Ninja",
"generator": "Ninja",
"binaryDir": "${sourceDir}/build/linux-arm64-gcc-rel",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "MinSizeRel",
"CMAKE_C_COMPILER": "gcc",
"CMAKE_CXX_COMPILER": "g++",
"ENABLE_VULKAN": "ON"
}
},
{
"name": "linux-arm64-gcc-dbg",
"displayName": "Linux ARM64 GCC Debug",
"description": "Debug build for Linux ARM64 with GCC and Ninja",
"generator": "Ninja",
"binaryDir": "${sourceDir}/build/linux-arm64-gcc-dbg",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_C_COMPILER": "gcc",
"CMAKE_CXX_COMPILER": "g++",
"ENABLE_VULKAN": "ON"
}
},
{
"name": "macos-rel",
"displayName": "macOS Release",
Expand Down Expand Up @@ -236,43 +184,23 @@
"jobs": 0
},
{
"name": "linux-x64-rel",
"configurePreset": "linux-x64-rel",
"jobs": 0
},
{
"name": "linux-x64-dbg",
"configurePreset": "linux-x64-dbg",
"jobs": 0
},
{
"name": "linux-x64-gcc-rel",
"configurePreset": "linux-x64-gcc-rel",
"jobs": 0
},
{
"name": "linux-x64-gcc-dbg",
"configurePreset": "linux-x64-gcc-dbg",
"jobs": 0
},
{
"name": "linux-arm64-rel",
"configurePreset": "linux-arm64-rel",
"name": "linux-clang-x64-rel",
"configurePreset": "linux-clang-x64-rel",
"jobs": 0
},
{
"name": "linux-arm64-dbg",
"configurePreset": "linux-arm64-dbg",
"name": "linux-clang-x64-dbg",
"configurePreset": "linux-clang-x64-dbg",
"jobs": 0
},
{
"name": "linux-arm64-gcc-rel",
"configurePreset": "linux-arm64-gcc-rel",
"name": "linux-clang-arm64-rel",
"configurePreset": "linux-clang-arm64-rel",
"jobs": 0
},
{
"name": "linux-arm64-gcc-dbg",
"configurePreset": "linux-arm64-gcc-dbg",
"name": "linux-clang-arm64-dbg",
"configurePreset": "linux-clang-arm64-dbg",
"jobs": 0
},
{
Expand Down
Loading