Skip to content

Commit 9136c04

Browse files
authored
Fix failure to post Mac builds to forums
Also includes replacement of string literals with constants to reduce maintenance overhead in the event the name of a group changes.
1 parent 8792699 commit 9136c04

File tree

1 file changed

+25
-18
lines changed

1 file changed

+25
-18
lines changed

ci/post/nebula.py

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@
77
from file_list import ReleaseFile
88
from util import retry_multi, GLOBAL_TIMEOUT
99

10+
LINUX_KEY = "Linux"
11+
MACOSX_KEY = "Mac"
12+
WIN32_SSE2_KEY = "Win32-SSE2"
13+
WIN64_SSE2_KEY = "Win64-SSE2"
14+
WIN32_AVX_KEY = "Win32-AVX"
15+
WIN64_AVX_KEY = "Win64-AVX"
16+
1017
metadata = {
1118
'type': 'engine',
1219
'title': 'FSO',
@@ -26,28 +33,28 @@
2633
}
2734

2835
platforms = {
29-
'Linux': 'linux',
30-
'MacOSX': 'macosx',
31-
'Win32-SSE2': 'windows',
32-
'Win64-SSE2': 'windows',
33-
'Win32-AVX': 'windows',
34-
'Win64-AVX': 'windows'
36+
LINUX_KEY: 'linux',
37+
MACOSX_KEY: 'macosx',
38+
WIN32_SSE2_KEY: 'windows',
39+
WIN64_SSE2_KEY: 'windows',
40+
WIN32_AVX_KEY: 'windows',
41+
WIN64_AVX_KEY: 'windows'
3542
}
3643

3744
envs = {
38-
'Linux': 'linux && x86_64', # Linux only has 64bit builds
39-
'MacOSX': 'macosx',
40-
'Win32-SSE2': 'windows',
41-
'Win64-SSE2': 'windows && x86_64',
42-
'Win32-AVX': 'windows && avx',
43-
'Win64-AVX': 'windows && avx && x86_64'
45+
LINUX_KEY: 'linux && x86_64', # Linux only has 64bit builds
46+
MACOSX_KEY: 'macosx',
47+
WIN32_SSE2_KEY: 'windows',
48+
WIN64_SSE2_KEY: 'windows && x86_64',
49+
WIN32_AVX_KEY: 'windows && avx',
50+
WIN64_AVX_KEY: 'windows && avx && x86_64'
4451
}
4552

4653
subdirs = {
47-
'Win32-SSE2': 'x86',
48-
'Win64-SSE2': 'x64',
49-
'Win32-AVX': 'x86_avx',
50-
'Win64-AVX': 'x64_avx'
54+
WIN32_SSE2_KEY: 'x86',
55+
WIN64_SSE2_KEY: 'x64',
56+
WIN32_AVX_KEY: 'x86_avx',
57+
WIN64_AVX_KEY: 'x64_avx'
5158
}
5259

5360

@@ -103,7 +110,7 @@ def render_nebula_release(version, stability, files, config):
103110
'filename': dest_fn
104111
})
105112

106-
if group == 'Linux' and fn.endswith('.AppImage'):
113+
if group == LINUX_KEY and fn.endswith('.AppImage'):
107114
if 'qtfred' in fn:
108115
if '-FASTDBG' in fn:
109116
label = 'QtFRED Debug'
@@ -128,7 +135,7 @@ def render_nebula_release(version, stability, files, config):
128135
'label': label,
129136
'properties': props,
130137
})
131-
elif group == 'MacOSX' and fn.startswith(os.path.basename(fn) + '.app/'):
138+
elif group == MACOSX_KEY and fn.startswith(os.path.basename(fn) + '.app/'):
132139
if 'qtfred' in fn:
133140
if '-FASTDBG' in fn:
134141
label = 'QtFRED Debug'

0 commit comments

Comments
 (0)