From 3a4c93972d9d8bfea5761653ca3bacb3fb402df2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole-Andr=C3=A9=20Rodlie?= Date: Sun, 25 Aug 2024 16:20:01 +0200 Subject: [PATCH] Update CI Try using image from dockerhub. --- src/scripts/build.sh | 3 ++- src/scripts/run_vfxplatform.sh | 11 ++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/scripts/build.sh b/src/scripts/build.sh index 79dc9e292..0ddb7dc7a 100755 --- a/src/scripts/build.sh +++ b/src/scripts/build.sh @@ -25,6 +25,7 @@ MKJOBS=${MKJOBS:-2} COMMIT=`git rev-parse --short=8 HEAD` BRANCH=`git rev-parse --abbrev-ref HEAD` +REL=${REL:-0} ASDK=20240401 SDK=20240609 URL=https://github.com/friction2d/friction-sdk/releases/download/${SDK} @@ -48,4 +49,4 @@ fi cd ${CWD} -MKJOBS=${MKJOBS} REL=0 BRANCH=${BRANCH} COMMIT=${COMMIT} ./src/scripts/run_vfxplatform.sh +LOCAL_BUILD=0 MKJOBS=${MKJOBS} REL=${REL} BRANCH=${BRANCH} COMMIT=${COMMIT} ./src/scripts/run_vfxplatform.sh diff --git a/src/scripts/run_vfxplatform.sh b/src/scripts/run_vfxplatform.sh index a453d9fd8..baed807d0 100755 --- a/src/scripts/run_vfxplatform.sh +++ b/src/scripts/run_vfxplatform.sh @@ -28,7 +28,7 @@ TAG=${TAG:-""} CUSTOM=${CUSTOM:-""} MKJOBS=${MKJOBS:-32} ONLY_SDK=${ONLY_SDK:-0} -VFX_BUILD=${VFX_BUILD:-1} +LOCAL_BUILD=${LOCAL_BUILD:-1} DOWNLOAD_SDK=${DOWNLOAD_SDK:-0} SDK_VERSION="20240609" TAR_VERSION=${TAR_VERSION:-""} @@ -43,8 +43,13 @@ if [ ! -d "${CWD}/distfiles" ]; then mkdir -p ${CWD}/distfiles/sdk || true fi -if [ "${VFX_BUILD}" = 1 ]; then + +if [ "${LOCAL_BUILD}" = 1 ]; then (cd src/scripts; docker build -t friction-vfxplatform -f Dockerfile.vfxplatform .) + ${DOCKER} friction-vfxplatform +else + docker pull frictiongraphics/friction-vfxplatform-sdk + ${DOCKER} friction-vfxplatform-sdk fi -${DOCKER} friction-vfxplatform +