RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-02-05 15:03:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ci fix trial 1

Browse Source
This commit is contained in:
Loup-Garou911XD 2024-05-19 16:29:13 +05:30
parent 93e452d346
commit c794e63091
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/cd.yml vendored
View File

@ -213,7 +213,7 @@ jobs:
with: with:
python-version: '3.12' python-version: '3.12'
- name: Setup build dependencies - name: Setup build dependencies
run: apt install cmake run: sudo apt-get install -y cmake
- name: Setup project environment - name: Setup project environment
run: make env run: make env
- name: Make the build - name: Make the build

13
tools/batools/build.py
View File

@ -662,7 +662,7 @@ def _docker_build(
image_name, image_name,
'-f', '-f',
dockerfile_dir, dockerfile_dir,
'.' '.',
] ]
if bombsquad_version is not None: if bombsquad_version is not None:
build_cmd = build_cmd + [ build_cmd = build_cmd + [
@ -684,22 +684,19 @@ def _docker_build(
def docker_build() -> None: def docker_build() -> None:
"""Build docker image.""" """Build docker image."""
import shutil
# todo: add option to toggle between prefab and cmake # todo: add option to toggle between prefab and cmake
from batools import version from batools import version
version_num, build_num = version.get_current_version() version_num, build_num = version.get_current_version()
image_name = 'bombsquad_server' image_name = 'bombsquad_server'
print( print(
f'Building docker image {image_name}' + f'Building docker image {image_name}'
'version {version_num}:{build_num}' + 'version {version_num}:{build_num}'
) )
_docker_build( _docker_build(
image_name, image_name,
os.getcwd()+'/config/docker/Dockerfile', os.getcwd() + '/config/docker/Dockerfile',
version_num, version_num,
build_num, build_num,
) )