Better branch detection for CI in the example project (#185)

* Update CI to look for corresponding GDK branch

* Try to infer branch even more

* Fix relative directory path to UnrealGDKVersion

* Add comment explanation

* Update ci/generate-pipeline-steps.sh

Co-authored-by: jessicafalk <[email protected]>

* Update ci/generate-pipeline-steps.sh

Co-authored-by: jessicafalk <[email protected]>

* Update ci/generate-pipeline-steps.sh

Co-authored-by: jessicafalk <[email protected]>

* Update ci/generate-pipeline-steps.sh

Co-authored-by: jessicafalk <[email protected]>

* Update ci/generate-pipeline-steps.sh

Co-authored-by: jessicafalk <[email protected]>

* Update ci/generate-pipeline-steps.sh

* Switch to grep for finding substring

* Fix wrong version of the branch to use

* Actually use the GDK_BRANCH in subsequent steps

Co-authored-by: jessicafalk <[email protected]>

Author: mironec

ci/generate-pipeline-steps.sh

@@ -11,10 +11,27 @@ else
     REPLACE_STRING="s|BUILKDITE_AGENT_PLACEHOLDER|windows|g"
 fi
 
-# Download the unreal-engine.version file from the GDK repo so we can run the example project builds on the same versions the GDK was run against
+# Download the unreal-engine.version file from the GDK repo so we can run the example project builds on the same versions the GDK was run against.
 # This is not the pinnacle of engineering, as we rely on GitHub's web interface to download the file, but it seems like GitHub disallows git archive
-# which would be our other option for downloading a single file
-GDK_BRANCH_LOCAL="${GDK_BRANCH:-master}"
+# which would be our other option for downloading a single file.
+# Also resolve the GDK branch to run against. The order of priority is:
+# GDK_BRANCH envvar > same-name branch as the branch we are currently on > UnrealGDKVersion.txt > "master".
+GDK_BRANCH_LOCAL="${GDK_BRANCH:-}"
+if [ -z "${GDK_BRANCH_LOCAL}" ]; then
+    GDK_REPO_HEADS=$(git ls-remote --heads "[email protected]:spatialos/UnrealGDK.git" "${BUILDKITE_BRANCH}")
+    EXAMPLEPROJECT_REPO_HEAD="refs/heads/${BUILDKITE_BRANCH}"
+    if echo "${GDK_REPO_HEADS}" | grep -qF "${EXAMPLEPROJECT_REPO_HEAD}"; then
+        GDK_BRANCH_LOCAL="${BUILDKITE_BRANCH}"
+    else
+        GDK_VERSION=$(cat UnrealGDKVersion.txt)
+        if [ -z "${GDK_VERSION}" ]; then
+            GDK_BRANCH_LOCAL="master"
+        else
+            GDK_BRANCH_LOCAL="${GDK_VERSION}"
+        fi
+    fi
+fi
+
 NUMBER_OF_TRIES=0
 while [ $NUMBER_OF_TRIES -lt 5 ]; do
     CURL_TIMEOUT=$((10<<NUMBER_OF_TRIES))
@@ -43,6 +60,7 @@ if [ -z "${ENGINE_VERSION}" ]; then
 
         export ENGINE_COMMIT_HASH="${COMMIT_HASH}"
         export STEP_NUMBER
+        export GDK_BRANCH="${GDK_BRANCH_LOCAL}"
         sed $REPLACE_STRING "${BUILDKITE_TEMPLATE_FILE}" | buildkite-agent pipeline upload
         STEP_NUMBER=$((STEP_NUMBER+1))
     done
@@ -51,7 +69,8 @@ if [ -z "${ENGINE_VERSION}" ]; then
     STEP_NUMBER=$((STEP_NUMBER-1))
     buildkite-agent meta-data set "engine-version-count" "${STEP_NUMBER}"
 else
-    echo "Generating steps for the specified engine version: $ENGINE_VERSION" 
-    export ENGINE_COMMIT_HASH=${ENGINE_VERSION}
+    echo "Generating steps for the specified engine version: ${ENGINE_VERSION}"
+    export ENGINE_COMMIT_HASH="${ENGINE_VERSION}"
+    export GDK_BRANCH="${GDK_BRANCH_LOCAL}"
     sed $REPLACE_STRING "${BUILDKITE_TEMPLATE_FILE}" | buildkite-agent pipeline upload
 fi

ci/nightly.template.steps.yaml

@@ -61,4 +61,5 @@ steps:
     env:
       ENGINE_COMMIT_HASH: "${ENGINE_COMMIT_HASH}"
       STEP_NUMBER: "${STEP_NUMBER}"
+      GDK_BRANCH: "${GDK_BRANCH}"
       UE-SharedDataCachePath: "\\\\gdk-for-unreal-cache.${CI_ENVIRONMENT}-intinf-eu1.i8e.io\\samba\\ddc"