Update CI

Try using image from dockerhub.
friction2d · Aug 25, 2024 · 3a4c939 · 3a4c939
1 parent c5f23ce
commit 3a4c939
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git 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
@@ -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
+