Merge branch 'main' into pr/622

Author: rodlie

.github/workflows/linux.yml

@@ -6,7 +6,11 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+    - name: Set Head Repo URL Environment Variable
+      if: github.event_name == 'pull_request' 
+      run: |
+        echo "HEAD_REPO_URL=${{ github.event.pull_request.head.repo.clone_url }}" >> $GITHUB_ENV
     - name: Build
       run: ./src/scripts/build.sh
     - name: Artifact

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`
 CUSTOM=${CUSTOM:-"CI"}
+HEAD_REPO_URL=${HEAD_REPO_URL:-""}
 
 REL=${REL:-0}
 APPIMG=20240401
@@ -50,4 +51,4 @@ fi
 
 cd ${CWD}
 
-LOCAL_BUILD=0 MKJOBS=${MKJOBS} REL=${REL} BRANCH=${BRANCH} COMMIT=${COMMIT} CUSTOM=${CUSTOM} ./src/scripts/run_docker.sh
+HEAD_REPO_URL=${HEAD_REPO_URL} LOCAL_BUILD=0 MKJOBS=${MKJOBS} REL=${REL} BRANCH=${BRANCH} COMMIT=${COMMIT} CUSTOM=${CUSTOM} ./src/scripts/run_docker.sh

src/scripts/build_vfxplatform.sh

@@ -34,6 +34,7 @@ SDK_VERSION=${SDK_VERSION:-""}
 ONLY_SDK=${ONLY_SDK:-0}
 SDK_TAR="${DISTFILES}/sdk/friction-sdk-${SDK_VERSION}r8-linux-x86_64.tar"
 TAR_VERSION=${TAR_VERSION:-""}
+HEAD_REPO_URL=${HEAD_REPO_URL:-""}
 
 # Build SDK
 if [ ! -d "${SDK}" ]; then
@@ -68,6 +69,7 @@ COMMIT=${COMMIT} \
 TAG=${TAG} \
 CUSTOM=${CUSTOM} \
 TAR_VERSION=${TAR_VERSION} \
+HEAD_REPO_URL=${HEAD_REPO_URL} \
 ${BUILD}/build_vfxplatform_friction.sh
 
 # Get Friction version

src/scripts/build_vfxplatform_friction.sh

@@ -32,11 +32,17 @@ COMMIT=${COMMIT:-""}
 TAG=${TAG:-""}
 CUSTOM=${CUSTOM:-""}
 TAR_VERSION=${TAR_VERSION:-""}
+HEAD_REPO_URL=${HEAD_REPO_URL:-""}
 
 export PATH="${SDK}/bin:${PATH}"
 export PKG_CONFIG_PATH="${SDK}/lib/pkgconfig"
 export LD_LIBRARY_PATH="${SDK}/lib:${LD_LIBRARY_PATH}"
 
+FRICTION_REPO_URL=https://github.com/friction2d/friction
+if [ "${HEAD_REPO_URL}" != "" ]; then
+    FRICTION_REPO_URL=${HEAD_REPO_URL}
+fi
+
 if [ ! -d "${SDK}" ]; then
     echo "MISSING SDK"
     exit 1
@@ -57,7 +63,7 @@ fi
 
 if [ ! -d "${BUILD}/friction" ]; then
     (cd ${BUILD} ;
-        git clone https://github.com/friction2d/friction
+        git clone ${FRICTION_REPO_URL}
         cd friction
         git checkout ${CHECKOUT}
         git submodule update -i --recursive

src/scripts/run_docker.sh

@@ -32,9 +32,10 @@ LOCAL_BUILD=${LOCAL_BUILD:-1}
 DOWNLOAD_SDK=${DOWNLOAD_SDK:-0}
 SDK_VERSION="1.0.0"
 TAR_VERSION=${TAR_VERSION:-""}
+HEAD_REPO_URL=${HEAD_REPO_URL:-""}
 
 DOCKER="docker run"
-DOCKER="${DOCKER} -e REL=${REL} -e MKJOBS=${MKJOBS} -e TAR_VERSION=${TAR_VERSION} -e SDK_VERSION=${SDK_VERSION} -e ONLY_SDK=${ONLY_SDK} -e DOWNLOAD_SDK=${DOWNLOAD_SDK} -e BRANCH=${BRANCH} -e COMMIT=${COMMIT} -e TAG=${TAG} -e CUSTOM=${CUSTOM}"
+DOCKER="${DOCKER} -e REL=${REL} -e HEAD_REPO_URL=${HEAD_REPO_URL} -e MKJOBS=${MKJOBS} -e TAR_VERSION=${TAR_VERSION} -e SDK_VERSION=${SDK_VERSION} -e ONLY_SDK=${ONLY_SDK} -e DOWNLOAD_SDK=${DOWNLOAD_SDK} -e BRANCH=${BRANCH} -e COMMIT=${COMMIT} -e TAG=${TAG} -e CUSTOM=${CUSTOM}"
 DOCKER="${DOCKER} -t --mount type=bind,source=${CWD}/distfiles,target=/mnt"
 
 if [ ! -d "${CWD}/distfiles" ]; then