Skip to content

Commit

Permalink
Another attempt - this time run in docker
Browse files Browse the repository at this point in the history
  • Loading branch information
royfalk committed Dec 15, 2024
1 parent 56618c7 commit dcbbc03
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
2 changes: 2 additions & 0 deletions script/cibuild
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ then
SRC_DOCKER_IMG_NAME="vegastrike/vega-strike-build-env:$(echo $FROM | sed 's/:/_/' | sed 's/\//_/')"
DST_DOCKER_IMG_NAME="building-vega-strike:$(echo $FROM | sed 's/:/_/' | sed 's/\//_/')"
DOCKER_CONTAINER_NAME="building-vega-strike_$(echo $FROM | sed 's/:/_/' | sed 's/\//_/')"
echo "Building docker image for $FROM / $COMPILER"
docker build --build-arg from=$SRC_DOCKER_IMG_NAME -t $DST_DOCKER_IMG_NAME .
echo "Running docker image for $FROM / $COMPILER"
docker run --env CC=$CC --env CXX=$CXX --env IS_RELEASE=$IS_RELEASE --env TAG_NAME=$TAG_NAME --env GITHUB_SHA=$GITHUB_SHA --env SHORT_SHA=$SHORT_SHA --env FLAGS="$FLAGS" --name $DOCKER_CONTAINER_NAME $DST_DOCKER_IMG_NAME
docker cp $DOCKER_CONTAINER_NAME:/usr/src/Vega-Strike-Engine-Source/bin .
if [ $IS_RELEASE -eq 1 ]
Expand Down
3 changes: 3 additions & 0 deletions script/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ echo "docker-entrypoint.sh: Flags passed in: $FLAGS"

# find /usr -iname '*libboost_python*'

echo "Re-run bootstrap
sudo script/bootstrap
if [ $IS_RELEASE -eq 1 ]
then
script/build -DCMAKE_BUILD_TYPE=RelWithDebInfo $FLAGS
Expand Down

0 comments on commit dcbbc03

Please sign in to comment.