build: enable ci builds for amd64 for xash fwgs engine
package: osx-x86 doesn't deserve separate package anymore
This commit is contained in:
parent
1db30ad48f
commit
2b6f6de7be
2 changed files with 15 additions and 4 deletions
8
.github/workflows/build.yml
vendored
8
.github/workflows/build.yml
vendored
|
|
@ -20,7 +20,7 @@ jobs:
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
arch: ['linux-x86', 'linux-x86-gcc', 'linux-aarch64', 'darwin-x86', 'windows-x86', 'windows-x86-gcc']
|
arch: ['linux-x86', 'linux-amd64', 'linux-x86-gcc', 'linux-aarch64', 'darwin-x86', 'windows-x86', 'windows-amd64', 'windows-x86-gcc']
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
|
@ -36,8 +36,12 @@ jobs:
|
||||||
CXX=clang CXX_LD=lld meson setup ${{matrix.arch}}
|
CXX=clang CXX_LD=lld meson setup ${{matrix.arch}}
|
||||||
elif [[ ${{matrix.arch}} == linux-x86-gcc ]]; then
|
elif [[ ${{matrix.arch}} == linux-x86-gcc ]]; then
|
||||||
CXX=gcc CXX_LD=gold meson setup ${{matrix.arch}}
|
CXX=gcc CXX_LD=gold meson setup ${{matrix.arch}}
|
||||||
|
elif [[ ${{matrix.arch}} == linux-amd64 ]]; then
|
||||||
|
CXX=clang CXX_LD=lld meson setup ${{matrix.arch}} -D64bit=true
|
||||||
|
elif [[ ${{matrix.arch}} == windows-amd64 ]]; then
|
||||||
|
meson setup ${{matrix.arch}} --cross-file ${{matrix.arch}} -D64bit=true
|
||||||
else
|
else
|
||||||
meson setup ${{matrix.arch}}/ --cross-file ${{matrix.arch}}
|
meson setup ${{matrix.arch}} --cross-file ${{matrix.arch}}
|
||||||
fi
|
fi
|
||||||
- name: Build sources
|
- name: Build sources
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
|
||||||
11
package.py
11
package.py
|
|
@ -132,8 +132,15 @@ class BotRelease(object):
|
||||||
self.pkg_matrix.append (BotPackage('windows', 'zip', {'windows-x86': 'dll'}))
|
self.pkg_matrix.append (BotPackage('windows', 'zip', {'windows-x86': 'dll'}))
|
||||||
self.pkg_matrix.append (BotPackage('windows', 'exe', {'windows-x86': 'dll'}))
|
self.pkg_matrix.append (BotPackage('windows', 'exe', {'windows-x86': 'dll'}))
|
||||||
self.pkg_matrix.append (BotPackage('linux', 'tar.xz', {'linux-x86': 'so'}))
|
self.pkg_matrix.append (BotPackage('linux', 'tar.xz', {'linux-x86': 'so'}))
|
||||||
self.pkg_matrix.append (BotPackage('darwin', 'zip', {'darwin-x86': 'dylib'}))
|
self.pkg_matrix.append (BotPackage('extras', 'zip',
|
||||||
self.pkg_matrix.append (BotPackage('extras', 'zip', {'linux-aarch64': 'so', 'linux-x86-gcc': 'so', 'windows-x86-gcc': 'dll', 'windows-x86-msvc': 'dll'}, extra=True))
|
{'linux-aarch64': 'so',
|
||||||
|
'linux-amd64': 'so',
|
||||||
|
'linux-x86-gcc': 'so',
|
||||||
|
'windows-x86-gcc': 'dll',
|
||||||
|
'windows-amd64': 'dll',
|
||||||
|
'windows-x86-msvc': 'dll',
|
||||||
|
'darwin-x86': 'dylib',
|
||||||
|
}, extra=True))
|
||||||
|
|
||||||
def create_dirs(self):
|
def create_dirs(self):
|
||||||
for dir in ['pwf', 'train', 'graph', 'logs']:
|
for dir in ['pwf', 'train', 'graph', 'logs']:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue