From c794e63091ec0454e51152fe5f7e452f687de33a Mon Sep 17 00:00:00 2001 From: Loup-Garou911XD Date: Sun, 19 May 2024 16:29:13 +0530 Subject: [PATCH] ci fix trial 1 --- .github/workflows/cd.yml | 2 +- tools/batools/build.py | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 202874ca..fdd07734 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -213,7 +213,7 @@ jobs: with: python-version: '3.12' - name: Setup build dependencies - run: apt install cmake + run: sudo apt-get install -y cmake - name: Setup project environment run: make env - name: Make the build diff --git a/tools/batools/build.py b/tools/batools/build.py index 24a711fc..48ffe89f 100644 --- a/tools/batools/build.py +++ b/tools/batools/build.py @@ -662,7 +662,7 @@ def _docker_build( image_name, '-f', dockerfile_dir, - '.' + '.', ] if bombsquad_version is not None: build_cmd = build_cmd + [ @@ -684,22 +684,19 @@ def _docker_build( def docker_build() -> None: """Build docker image.""" - import shutil - # todo: add option to toggle between prefab and cmake from batools import version version_num, build_num = version.get_current_version() image_name = 'bombsquad_server' - + print( - f'Building docker image {image_name}' + - 'version {version_num}:{build_num}' + f'Building docker image {image_name}' + + 'version {version_num}:{build_num}' ) _docker_build( image_name, - os.getcwd()+'/config/docker/Dockerfile', + os.getcwd() + '/config/docker/Dockerfile', version_num, build_num, ) -