diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0d9165d..bb6ebee 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 @@ -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 diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml index 1651737..fc9c605 100644 --- a/.github/workflows/linux_build.yml +++ b/.github/workflows/linux_build.yml @@ -95,7 +95,6 @@ jobs: run: | sudo apt-get update sudo apt-get -y install \ - build-essential \ ccache \ clang \ lld \ @@ -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 @@ -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 diff --git a/.github/workflows/nightly_release.yml b/.github/workflows/nightly_release.yml index c3230d4..a8d6beb 100644 --- a/.github/workflows/nightly_release.yml +++ b/.github/workflows/nightly_release.yml @@ -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)' @@ -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)' @@ -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 diff --git a/CMakePresets.json b/CMakePresets.json index 1617122..22a6e6e 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -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", @@ -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", @@ -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", @@ -137,11 +111,11 @@ } }, { - "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", @@ -149,32 +123,6 @@ "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", @@ -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 }, {