Skip to content

Commit d8c93bc

Browse files
SternXDSternXD
committed
Build: Remove GCC from Linux builds
We don’t need both and it may confuse users. If someone wants to use GCC they can but I don’t want to provide builds for both Signed-off-by: SternXD <stern@sidestore.io>
1 parent 224c81e commit d8c93bc

4 files changed

Lines changed: 20 additions & 165 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,6 @@ jobs:
2121
compiler: clang
2222
secrets: inherit
2323

24-
build_linux_x64_gcc:
25-
name: "🐧 Linux x64 (GCC)"
26-
uses: ./.github/workflows/linux_build.yml
27-
with:
28-
jobName: "Linux x64 GCC Build"
29-
artifactPrefixName: "myMCpp-linux-x64-gcc"
30-
platform: x64
31-
compiler: gcc
32-
secrets: inherit
33-
3424
build_linux_arm64_clang:
3525
name: "🐧 Linux ARM64 (Clang)"
3626
uses: ./.github/workflows/linux_build.yml
@@ -42,17 +32,6 @@ jobs:
4232
compiler: clang
4333
secrets: inherit
4434

45-
build_linux_arm64_gcc:
46-
name: "🐧 Linux ARM64 (GCC)"
47-
uses: ./.github/workflows/linux_build.yml
48-
with:
49-
jobName: "Linux ARM64 GCC Build"
50-
artifactPrefixName: "myMCpp-linux-arm64-gcc"
51-
os: ubuntu-24.04-arm
52-
platform: arm64
53-
compiler: gcc
54-
secrets: inherit
55-
5635
build_macos:
5736
name: "🍎 macOS"
5837
uses: ./.github/workflows/macos_build.yml

‎.github/workflows/linux_build.yml‎

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ jobs:
9595
run: |
9696
sudo apt-get update
9797
sudo apt-get -y install \
98-
build-essential \
9998
ccache \
10099
clang \
101100
lld \
@@ -147,15 +146,15 @@ jobs:
147146
run: |
148147
if [ "${{ inputs.buildType }}" = "Debug" ]; then
149148
if [ "${{ inputs.platform }}" = "arm64" ]; then
150-
PRESET="linux-arm64-dbg"
149+
PRESET="linux-clang-arm64-dbg"
151150
else
152-
PRESET="linux-x64-dbg"
151+
PRESET="linux-clang-x64-dbg"
153152
fi
154153
else
155154
if [ "${{ inputs.platform }}" = "arm64" ]; then
156-
PRESET="linux-arm64-rel"
155+
PRESET="linux-clang-arm64-rel"
157156
else
158-
PRESET="linux-x64-rel"
157+
PRESET="linux-clang-x64-rel"
159158
fi
160159
fi
161160
echo "PRESET=$PRESET" >> $GITHUB_ENV
@@ -166,28 +165,6 @@ jobs:
166165
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
167166
${{ inputs.cmakeFlags }}
168167
169-
- name: Configure CMake (GCC)
170-
if: inputs.compiler == 'gcc'
171-
run: |
172-
if [ "${{ inputs.buildType }}" = "Debug" ]; then
173-
if [ "${{ inputs.platform }}" = "arm64" ]; then
174-
PRESET="linux-arm64-gcc-dbg"
175-
else
176-
PRESET="linux-x64-gcc-dbg"
177-
fi
178-
else
179-
if [ "${{ inputs.platform }}" = "arm64" ]; then
180-
PRESET="linux-arm64-gcc-rel"
181-
else
182-
PRESET="linux-x64-gcc-rel"
183-
fi
184-
fi
185-
echo "PRESET=$PRESET" >> $GITHUB_ENV
186-
cmake --preset $PRESET \
187-
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
188-
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
189-
${{ inputs.cmakeFlags }}
190-
191168
- name: Build
192169
run: |
193170
ccache -p

‎.github/workflows/nightly_release.yml‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,6 @@ jobs:
7979
fetchTags: true
8080
secrets: inherit
8181

82-
build_linux_x64_gcc:
83-
if: github.repository == 'PCSX2/myMCpp'
84-
name: '🐧 Linux x64 (GCC, Nightly)'
85-
needs: cut_release
86-
uses: ./.github/workflows/linux_build.yml
87-
with:
88-
jobName: 'Linux x64 GCC Nightly Build'
89-
artifactPrefixName: 'myMCpp-nightly-linux-x64-gcc'
90-
platform: x64
91-
compiler: gcc
92-
fetchTags: true
93-
secrets: inherit
94-
9582
build_linux_arm64_clang:
9683
if: github.repository == 'PCSX2/myMCpp'
9784
name: '🐧 Linux ARM64 (Clang, Nightly)'
@@ -106,20 +93,6 @@ jobs:
10693
fetchTags: true
10794
secrets: inherit
10895

109-
build_linux_arm64_gcc:
110-
if: github.repository == 'PCSX2/myMCpp'
111-
name: '🐧 Linux ARM64 (GCC, Nightly)'
112-
needs: cut_release
113-
uses: ./.github/workflows/linux_build.yml
114-
with:
115-
jobName: 'Linux ARM64 GCC Nightly Build'
116-
artifactPrefixName: 'myMCpp-nightly-linux-arm64-gcc'
117-
os: ubuntu-24.04-arm
118-
platform: arm64
119-
compiler: gcc
120-
fetchTags: true
121-
secrets: inherit
122-
12396
build_macos:
12497
if: github.repository == 'PCSX2/myMCpp'
12598
name: '🍎 macOS (Nightly)'
@@ -192,9 +165,7 @@ jobs:
192165
needs:
193166
- cut_release
194167
- build_linux_x64_clang
195-
- build_linux_x64_gcc
196168
- build_linux_arm64_clang
197-
- build_linux_arm64_gcc
198169
- build_macos
199170
- build_windows_x64_clang
200171
- build_windows_x64_msvc

‎CMakePresets.json‎

Lines changed: 16 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@
7272
}
7373
},
7474
{
75-
"name": "linux-x64-rel",
75+
"name": "linux-clang-x64-rel",
7676
"displayName": "Linux x64 Release",
7777
"description": "Release build for Linux x64 with Clang and Ninja",
7878
"generator": "Ninja",
79-
"binaryDir": "${sourceDir}/build/linux-x64-rel",
79+
"binaryDir": "${sourceDir}/build/linux-clang-x64-rel",
8080
"cacheVariables": {
8181
"CMAKE_BUILD_TYPE": "MinSizeRel",
8282
"CMAKE_C_COMPILER": "clang",
@@ -85,11 +85,11 @@
8585
}
8686
},
8787
{
88-
"name": "linux-x64-dbg",
88+
"name": "linux-clang-x64-dbg",
8989
"displayName": "Linux x64 Debug",
9090
"description": "Debug build for Linux x64 with Clang and Ninja",
9191
"generator": "Ninja",
92-
"binaryDir": "${sourceDir}/build/linux-x64-dbg",
92+
"binaryDir": "${sourceDir}/build/linux-clang-x64-dbg",
9393
"cacheVariables": {
9494
"CMAKE_BUILD_TYPE": "Debug",
9595
"CMAKE_C_COMPILER": "clang",
@@ -98,37 +98,11 @@
9898
}
9999
},
100100
{
101-
"name": "linux-x64-gcc-rel",
102-
"displayName": "Linux x64 GCC Release",
103-
"description": "Release build for Linux x64 with GCC and Ninja",
104-
"generator": "Ninja",
105-
"binaryDir": "${sourceDir}/build/linux-x64-gcc-rel",
106-
"cacheVariables": {
107-
"CMAKE_BUILD_TYPE": "MinSizeRel",
108-
"CMAKE_C_COMPILER": "gcc",
109-
"CMAKE_CXX_COMPILER": "g++",
110-
"ENABLE_VULKAN": "ON"
111-
}
112-
},
113-
{
114-
"name": "linux-x64-gcc-dbg",
115-
"displayName": "Linux x64 GCC Debug",
116-
"description": "Debug build for Linux x64 with GCC and Ninja",
117-
"generator": "Ninja",
118-
"binaryDir": "${sourceDir}/build/linux-x64-gcc-dbg",
119-
"cacheVariables": {
120-
"CMAKE_BUILD_TYPE": "Debug",
121-
"CMAKE_C_COMPILER": "gcc",
122-
"CMAKE_CXX_COMPILER": "g++",
123-
"ENABLE_VULKAN": "ON"
124-
}
125-
},
126-
{
127-
"name": "linux-arm64-rel",
101+
"name": "linux-clang-arm64-rel",
128102
"displayName": "Linux ARM64 Release",
129103
"description": "Release build for Linux ARM64 with Clang and Ninja",
130104
"generator": "Ninja",
131-
"binaryDir": "${sourceDir}/build/linux-arm64-rel",
105+
"binaryDir": "${sourceDir}/build/linux-clang-arm64-rel",
132106
"cacheVariables": {
133107
"CMAKE_BUILD_TYPE": "MinSizeRel",
134108
"CMAKE_C_COMPILER": "clang",
@@ -137,44 +111,18 @@
137111
}
138112
},
139113
{
140-
"name": "linux-arm64-dbg",
114+
"name": "linux-clang-arm64-dbg",
141115
"displayName": "Linux ARM64 Debug",
142116
"description": "Debug build for Linux ARM64 with Clang and Ninja",
143117
"generator": "Ninja",
144-
"binaryDir": "${sourceDir}/build/linux-arm64-dbg",
118+
"binaryDir": "${sourceDir}/build/linux-clang-arm64-dbg",
145119
"cacheVariables": {
146120
"CMAKE_BUILD_TYPE": "Debug",
147121
"CMAKE_C_COMPILER": "clang",
148122
"CMAKE_CXX_COMPILER": "clang++",
149123
"ENABLE_VULKAN": "ON"
150124
}
151125
},
152-
{
153-
"name": "linux-arm64-gcc-rel",
154-
"displayName": "Linux ARM64 GCC Release",
155-
"description": "Release build for Linux ARM64 with GCC and Ninja",
156-
"generator": "Ninja",
157-
"binaryDir": "${sourceDir}/build/linux-arm64-gcc-rel",
158-
"cacheVariables": {
159-
"CMAKE_BUILD_TYPE": "MinSizeRel",
160-
"CMAKE_C_COMPILER": "gcc",
161-
"CMAKE_CXX_COMPILER": "g++",
162-
"ENABLE_VULKAN": "ON"
163-
}
164-
},
165-
{
166-
"name": "linux-arm64-gcc-dbg",
167-
"displayName": "Linux ARM64 GCC Debug",
168-
"description": "Debug build for Linux ARM64 with GCC and Ninja",
169-
"generator": "Ninja",
170-
"binaryDir": "${sourceDir}/build/linux-arm64-gcc-dbg",
171-
"cacheVariables": {
172-
"CMAKE_BUILD_TYPE": "Debug",
173-
"CMAKE_C_COMPILER": "gcc",
174-
"CMAKE_CXX_COMPILER": "g++",
175-
"ENABLE_VULKAN": "ON"
176-
}
177-
},
178126
{
179127
"name": "macos-rel",
180128
"displayName": "macOS Release",
@@ -236,43 +184,23 @@
236184
"jobs": 0
237185
},
238186
{
239-
"name": "linux-x64-rel",
240-
"configurePreset": "linux-x64-rel",
241-
"jobs": 0
242-
},
243-
{
244-
"name": "linux-x64-dbg",
245-
"configurePreset": "linux-x64-dbg",
246-
"jobs": 0
247-
},
248-
{
249-
"name": "linux-x64-gcc-rel",
250-
"configurePreset": "linux-x64-gcc-rel",
251-
"jobs": 0
252-
},
253-
{
254-
"name": "linux-x64-gcc-dbg",
255-
"configurePreset": "linux-x64-gcc-dbg",
256-
"jobs": 0
257-
},
258-
{
259-
"name": "linux-arm64-rel",
260-
"configurePreset": "linux-arm64-rel",
187+
"name": "linux-clang-x64-rel",
188+
"configurePreset": "linux-clang-x64-rel",
261189
"jobs": 0
262190
},
263191
{
264-
"name": "linux-arm64-dbg",
265-
"configurePreset": "linux-arm64-dbg",
192+
"name": "linux-clang-x64-dbg",
193+
"configurePreset": "linux-clang-x64-dbg",
266194
"jobs": 0
267195
},
268196
{
269-
"name": "linux-arm64-gcc-rel",
270-
"configurePreset": "linux-arm64-gcc-rel",
197+
"name": "linux-clang-arm64-rel",
198+
"configurePreset": "linux-clang-arm64-rel",
271199
"jobs": 0
272200
},
273201
{
274-
"name": "linux-arm64-gcc-dbg",
275-
"configurePreset": "linux-arm64-gcc-dbg",
202+
"name": "linux-clang-arm64-dbg",
203+
"configurePreset": "linux-clang-arm64-dbg",
276204
"jobs": 0
277205
},
278206
{

0 commit comments

Comments
 (0)