Skip to content

Commit 80ae91e

Browse files
erosdomeerosdome
authored
Remove unused machine type fields (#1670)
1 parent b32e7d1 commit 80ae91e

File tree

5 files changed

+0
-56
lines changed

5 files changed

+0
-56
lines changed

‎source/javascripts/core/api/StacksAndMachinesApi.mswMocks.ts‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,11 @@ const DEFAULT_MACHINES: MachineApiItem[] = [
1212
{
1313
id: 'm1.medium',
1414
name: 'M1 Medium',
15-
chip: 'apple',
1615
cpu_count: '4 vCPU',
1716
cpu_description: '3.2GHz',
1817
ram: '6 GB RAM',
1918
credit_per_min: 2,
2019
os_id: 'macos',
21-
is_available: true,
2220
is_promoted: false,
2321
available_on_stacks: [
2422
'osx-xcode-16.1.x-edge',
@@ -32,13 +30,11 @@ const DEFAULT_MACHINES: MachineApiItem[] = [
3230
{
3331
id: 'standard',
3432
name: 'Medium',
35-
chip: 'intel',
3633
cpu_count: '4 vCPU',
3734
cpu_description: '3.1GHz',
3835
ram: '16 GB RAM',
3936
credit_per_min: 1,
4037
os_id: 'linux',
41-
is_available: true,
4238
is_promoted: false,
4339
available_on_stacks: ['ubuntu-noble-24.04-bitrise-2025', 'ubuntu-jammy-22.04-bitrise-2024'],
4440
},
@@ -211,13 +207,11 @@ function groupedMachines(options?: Options): MachineGroupApiItem[] {
211207
{
212208
id: 'm1.large',
213209
name: 'M1 Large',
214-
chip: 'apple',
215210
cpu_count: '8 vCPU',
216211
cpu_description: '3.2GHz',
217212
ram: '12 GB RAM',
218213
credit_per_min: 4,
219214
os_id: 'macos',
220-
is_available: true,
221215
is_promoted: false,
222216
available_on_stacks: [
223217
'osx-xcode-16.1.x-edge',
@@ -231,13 +225,11 @@ function groupedMachines(options?: Options): MachineGroupApiItem[] {
231225
{
232226
id: 'm2.medium',
233227
name: 'M2 Pro Medium',
234-
chip: 'apple',
235228
cpu_count: '4 vCPU',
236229
cpu_description: '3.7GHz',
237230
ram: '6 GB RAM',
238231
credit_per_min: 3,
239232
os_id: 'macos',
240-
is_available: true,
241233
is_promoted: false,
242234
available_on_stacks: [
243235
'osx-xcode-16.1.x-edge',
@@ -252,13 +244,11 @@ function groupedMachines(options?: Options): MachineGroupApiItem[] {
252244
{
253245
id: 'm2.large',
254246
name: 'M2 Pro Large',
255-
chip: 'apple',
256247
cpu_count: '6 vCPU',
257248
cpu_description: '3.7GHz',
258249
ram: '14 GB RAM',
259250
credit_per_min: 5,
260251
os_id: 'macos',
261-
is_available: true,
262252
is_promoted: false,
263253
available_on_stacks: [
264254
'osx-xcode-16.1.x-edge',
@@ -273,90 +263,76 @@ function groupedMachines(options?: Options): MachineGroupApiItem[] {
273263
{
274264
id: 'm2.x-large',
275265
name: 'M2 Pro X Large',
276-
chip: 'apple',
277266
cpu_count: '12 vCPU',
278267
cpu_description: '3.7GHz',
279268
ram: '28 GB RAM',
280269
credit_per_min: 9,
281270
os_id: 'macos',
282-
is_available: true,
283271
is_promoted: false,
284272
available_on_stacks: ['osx-xcode-16.1.x-edge', 'osx-xcode-16.0.x-edge', 'osx-xcode-16.0.x', 'mixed-stack'],
285273
},
286274
{
287275
id: 'intel.medium',
288276
name: 'Intel Medium',
289-
chip: 'intel',
290277
cpu_count: '4 vCPU',
291278
cpu_description: '3.1GHz',
292279
ram: '16 GB RAM',
293280
credit_per_min: 1,
294281
os_id: 'linux',
295-
is_available: true,
296282
is_promoted: false,
297283
available_on_stacks: ['ubuntu-noble-24.04-bitrise-2025', 'ubuntu-jammy-22.04-bitrise-2024'],
298284
},
299285
{
300286
id: 'intel.large',
301287
name: 'Intel Large',
302-
chip: 'intel',
303288
cpu_count: '8 vCPU',
304289
cpu_description: '3.1GHz',
305290
ram: '32 GB RAM',
306291
credit_per_min: 2,
307292
os_id: 'linux',
308-
is_available: true,
309293
is_promoted: false,
310294
available_on_stacks: ['ubuntu-noble-24.04-bitrise-2025', 'ubuntu-jammy-22.04-bitrise-2024'],
311295
},
312296
{
313297
id: 'amd.medium',
314298
name: 'EPYC Zen4 Medium',
315-
chip: 'amd',
316299
cpu_count: '4 vCPU',
317300
cpu_description: '3.7GHz',
318301
ram: '16 GB RAM',
319302
credit_per_min: 1,
320303
os_id: 'linux',
321-
is_available: true,
322304
is_promoted: false,
323305
available_on_stacks: ['ubuntu-noble-24.04-bitrise-2025', 'ubuntu-jammy-22.04-bitrise-2024', 'mixed-stack'],
324306
},
325307
{
326308
id: 'amd.large',
327309
name: 'EPYC Zen4 Large',
328-
chip: 'amd',
329310
cpu_count: '8 vCPU',
330311
cpu_description: '3.7GHz',
331312
ram: '32 GB RAM',
332313
credit_per_min: 3,
333314
os_id: 'linux',
334-
is_available: true,
335315
is_promoted: false,
336316
available_on_stacks: ['ubuntu-noble-24.04-bitrise-2025', 'ubuntu-jammy-22.04-bitrise-2024', 'mixed-stack'],
337317
},
338318
{
339319
id: 'amd.x-large',
340320
name: 'EPYC Zen4 X Large',
341-
chip: 'amd',
342321
cpu_count: '16 vCPU',
343322
cpu_description: '3.7GHz',
344323
ram: '64 GB RAM',
345324
credit_per_min: 5,
346325
os_id: 'linux',
347-
is_available: true,
348326
is_promoted: false,
349327
available_on_stacks: ['ubuntu-noble-24.04-bitrise-2025', 'ubuntu-jammy-22.04-bitrise-2024', 'mixed-stack'],
350328
},
351329
{
352330
id: 'machine-x',
353331
name: 'Non Credit Machine',
354-
chip: 'apple',
355332
cpu_count: '8 vCPU',
356333
cpu_description: '3.7GHz',
357334
ram: '32 GB RAM',
358335
os_id: 'linux',
359-
is_available: true,
360336
is_promoted: false,
361337
available_on_stacks: ['ubuntu-noble-24.04-bitrise-2025'],
362338
},
@@ -369,48 +345,40 @@ function groupedMachines(options?: Options): MachineGroupApiItem[] {
369345
{
370346
id: 'machine-y1',
371347
name: 'Machine Y1 (Mac OS)',
372-
chip: 'apple',
373348
cpu_count: '8 vCPU',
374349
cpu_description: '3.7GHz',
375350
ram: '32 GB RAM',
376351
os_id: 'macos',
377-
is_available: false,
378352
is_promoted: true,
379353
available_on_stacks: ['osx-xcode-16.1.x-edge', 'osx-xcode-16.0.x-edge'],
380354
},
381355
{
382356
id: 'machine-y2',
383357
name: 'Machine Y2 (Mac OS)',
384-
chip: 'apple',
385358
cpu_count: '8 vCPU',
386359
cpu_description: '3.7GHz',
387360
ram: '32 GB RAM',
388361
os_id: 'macos',
389-
is_available: false,
390362
is_promoted: true,
391363
available_on_stacks: ['osx-xcode-16.1.x-edge', 'osx-xcode-16.0.x-edge'],
392364
},
393365
{
394366
id: 'machine-z1',
395367
name: 'Machine Z1 (Linux)',
396-
chip: 'amd',
397368
cpu_count: '8 vCPU',
398369
cpu_description: '3.7GHz',
399370
ram: '32 GB RAM',
400371
os_id: 'linux',
401-
is_available: false,
402372
is_promoted: true,
403373
available_on_stacks: ['ubuntu-noble-24.04-bitrise-2025'],
404374
},
405375
{
406376
id: 'machine-z2',
407377
name: 'Machine Z2 (Linux)',
408-
chip: 'amd',
409378
cpu_count: '8 vCPU',
410379
cpu_description: '3.7GHz',
411380
ram: '32 GB RAM',
412381
os_id: 'linux',
413-
is_available: false,
414382
is_promoted: true,
415383
available_on_stacks: ['ubuntu-noble-24.04-bitrise-2025'],
416384
},

‎source/javascripts/core/api/StacksAndMachinesApi.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@ type MachineApiItem = {
2626
id: string;
2727
name: string;
2828
os_id?: string;
29-
is_available?: boolean;
3029
is_promoted?: boolean;
3130
ram: string;
32-
chip: string;
3331
cpu_count: string;
3432
cpu_description: string;
3533
credit_per_min?: number;
@@ -91,10 +89,8 @@ function toMachineType(item: MachineApiItem): MachineType {
9189
id: item.id,
9290
name: item.name,
9391
os: mapOSValues(item.os_id ?? ''),
94-
isAvailable: item.is_available ?? false,
9592
isPromoted: item.is_promoted ?? false,
9693
ram: item.ram,
97-
chip: item.chip,
9894
cpuCount: item.cpu_count,
9995
cpuDescription: item.cpu_description,
10096
creditPerMinute: item.credit_per_min,

‎source/javascripts/core/models/StackAndMachine.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,9 @@ export type MachineType = {
3939
os: MachineOS;
4040
name: string;
4141
ram: string;
42-
chip: string;
4342
cpuCount: string;
4443
cpuDescription: string;
4544
creditPerMinute?: number;
46-
isAvailable: boolean;
4745
isPromoted: boolean;
4846
availableOnStacks?: string[];
4947
};

‎source/javascripts/core/services/StackAndMachineService.spec.ts‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,9 @@ const machines: MachineType[] = [
9595
name: 'Standard',
9696
creditPerMinute: 1,
9797
ram: '8GB',
98-
chip: 'AMD',
9998
cpuCount: '4 CPU',
10099
cpuDescription: '3.5 GHz',
101100
os: 'linux',
102-
isAvailable: true,
103101
isPromoted: false,
104102
availableOnStacks: ['ubuntu-jammy-22.04-bitrise-2024', 'ubuntu-focal-20.04-bitrise-2024'],
105103
},
@@ -108,11 +106,9 @@ const machines: MachineType[] = [
108106
name: 'Elite',
109107
creditPerMinute: 1,
110108
ram: '16GB',
111-
chip: 'AMD',
112109
cpuCount: '8 CPU',
113110
cpuDescription: '4.0 GHz',
114111
os: 'linux',
115-
isAvailable: true,
116112
isPromoted: false,
117113
availableOnStacks: ['ubuntu-jammy-22.04-bitrise-2024', 'ubuntu-focal-20.04-bitrise-2024'],
118114
},
@@ -121,11 +117,9 @@ const machines: MachineType[] = [
121117
name: 'M1',
122118
creditPerMinute: 2,
123119
ram: '16GB',
124-
chip: 'M1',
125120
cpuCount: '8 CPU',
126121
cpuDescription: '3.5 GHz',
127122
os: 'macos',
128-
isAvailable: true,
129123
isPromoted: false,
130124
availableOnStacks: ['osx-xcode-16.1.x', 'osx-xcode-16.0.x', 'osx-xcode-15.0.x', 'osx-xcode-14.0.x'],
131125
},
@@ -134,11 +128,9 @@ const machines: MachineType[] = [
134128
name: 'M2',
135129
creditPerMinute: 3,
136130
ram: '24GB',
137-
chip: 'M2',
138131
cpuCount: '12 CPU',
139132
cpuDescription: '4.0 GHz',
140133
os: 'macos',
141-
isAvailable: true,
142134
isPromoted: false,
143135
availableOnStacks: ['osx-xcode-16.1.x', 'osx-xcode-16.0.x', 'osx-xcode-15.0.x', 'osx-xcode-14.0.x'],
144136
},
@@ -147,11 +139,9 @@ const machines: MachineType[] = [
147139
name: 'M3',
148140
creditPerMinute: 4,
149141
ram: '32GB',
150-
chip: 'M3',
151142
cpuCount: '16 CPU',
152143
cpuDescription: '4.5 GHz',
153144
os: 'macos',
154-
isAvailable: true,
155145
isPromoted: false,
156146
availableOnStacks: ['osx-xcode-16.1.x', 'osx-xcode-16.0.x'],
157147
},
@@ -160,11 +150,9 @@ const machines: MachineType[] = [
160150
name: 'M4',
161151
creditPerMinute: 8,
162152
ram: '64GB',
163-
chip: 'M4',
164153
cpuCount: '24 CPU',
165154
cpuDescription: '4.5 GHz',
166155
os: 'macos',
167-
isAvailable: true,
168156
isPromoted: true,
169157
availableOnStacks: ['osx-xcode-16.1.x', 'osx-xcode-16.0.x'],
170158
},
@@ -173,11 +161,9 @@ const machines: MachineType[] = [
173161
name: 'XL',
174162
creditPerMinute: 8,
175163
ram: '64GB',
176-
chip: 'AMD',
177164
cpuCount: '32 CPU',
178165
cpuDescription: '4.5 GHz',
179166
os: 'linux',
180-
isAvailable: true,
181167
isPromoted: true,
182168
availableOnStacks: undefined,
183169
},
@@ -186,11 +172,9 @@ const machines: MachineType[] = [
186172
name: 'Joker',
187173
creditPerMinute: 16,
188174
ram: '128GB',
189-
chip: 'Joker',
190175
cpuCount: '64 CPU',
191176
cpuDescription: '5.0 GHz',
192177
os: 'unknown',
193-
isAvailable: true,
194178
isPromoted: true,
195179
availableOnStacks: undefined,
196180
},

‎source/javascripts/core/services/StackAndMachineService.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,9 @@ function createMachineType(override?: PartialDeep<MachineTypeWithValue>): Machin
144144
value: '',
145145
name: '',
146146
ram: '',
147-
chip: '',
148147
cpuCount: '',
149148
cpuDescription: '',
150149
creditPerMinute: 0,
151-
isAvailable: false,
152150
isPromoted: false,
153151
os: 'unknown',
154152
};

0 commit comments

Comments
 (0)