NPM Packages support (#60)

* Upgrade to NPM Packages

* Update pin

* Changelog

* Update bootstrap

* Update buildkite agent

Author: zeroZshadow

.buildkite/premerge.steps.yaml

@@ -13,7 +13,7 @@ common: &common
     - "environment=production"
     - "permission_set=builder"
     - "platform=windows"
-    - "queue=v3-1558109315-a75758857a3cdfbe-------z"
+    - "queue=v3-1562257704-92dadf3bbbe69f0b-------z"
     - "scaler_version=2"
     - "minimum_instances=1"
     - "agent_count=1"
@@ -46,7 +46,7 @@ steps:
       BUILD_TARGET_FILTER: "android"
       SCRIPTING_BACKEND: "mono"
 
-  - label: "build iOS"
+  - label: "build :ios:"
     command: bash -c .shared-ci/scripts/build-worker.sh
     <<: *common
     artifact_paths:

.buildkite/release-qa.steps.yaml

@@ -13,7 +13,7 @@ common: &common
     - "environment=production"
     - "permission_set=builder"
     - "platform=windows"
-    - "queue=v3-1558109315-a75758857a3cdfbe-------z"
+    - "queue=v3-1562257704-92dadf3bbbe69f0b-------z"
     - "scaler_version=2"
     - "minimum_instances=1"
     - "agent_count=1"
@@ -47,7 +47,7 @@ steps:
       BUILD_TARGET_FILTER: "android"
       SCRIPTING_BACKEND: "mono"
 
-  - label: "build iOS"
+  - label: "build :ios:"
     command: bash -c .shared-ci/scripts/build-worker.sh
     <<: *common
     artifact_paths:

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Changed
+
+- Changed manifest to use GDK Packages with NPM instead of sideloading.
+
 ### Internal
 
 - Split the `MobileClient` build into separate `iOS` and `Android` buildkite steps.

ci/bootstrap.sh

@@ -1,6 +1,18 @@
 #!/usr/bin/env bash
 set -e -u -x -o pipefail
 
+function isLinux() {
+  [[ "$(uname -s)" == "Linux" ]];
+}
+
+function isMacOS() {
+  [[ "$(uname -s)" == "Darwin" ]];
+}
+
+function isWindows() {
+  ! ( isLinux || isMacOS );
+}
+
 cd "$(dirname "$0")/../"
 
 SHARED_CI_DIR="$(pwd)/.shared-ci"
@@ -29,6 +41,17 @@ CLONE_URI="[email protected]:spatialos/gdk-for-unity.git"
 TARGET_DIRECTORY="$(realpath $(pwd)/../gdk-for-unity)"
 PINNED_VERSION=$(cat ./gdk.pinned)
 
+if [[ -z ${BUILDKITE:-} ]]; then
+    echo "Warning: About to delete ${TARGET_DIRECTORY}. Please confirm. (Default is Cancel)"
+    read -p "Y/N > " -r
+    echo    # (optional) move to a new line
+    if [[ $REPLY =~ ^[Yy]$ ]]; then
+        echo "Deleting..."
+    else
+        exit 1
+    fi
+fi
+
 rm -rf "${TARGET_DIRECTORY}"
 
 mkdir "${TARGET_DIRECTORY}"
@@ -39,4 +62,22 @@ pushd "${TARGET_DIRECTORY}"
     git remote add origin "${CLONE_URI}"
     git fetch --depth 20 origin develop
     git checkout "${PINNED_VERSION}"
+    ./init.sh
 popd
+
+if isWindows; then
+    if [[ -z ${BUILDKITE:-} ]]; then
+        powershell Start-Process -Verb RunAs -WindowStyle Hidden -Wait -FilePath dotnet.exe -ArgumentList "run", "-p", "$(pwd)/.shared-ci/tools/PackageSymLinker/PackageSymLinker.csproj", "\-\-", "--packages-source-dir", "${TARGET_DIRECTORY}/workers/unity/Packages", "--package-target-dir", "$(pwd)/workers/unity/Packages"
+        exit 0
+    fi
+fi
+
+EXTRA_ARGS=""
+
+if [[ -n ${BUILDKITE:-} ]]; then
+    EXTRA_ARGS="--copy"
+fi
+
+dotnet run -p ./.shared-ci/tools/PackageSymLinker/PackageSymLinker.csproj -- \
+    --packages-source-dir "${TARGET_DIRECTORY}/workers/unity/Packages" \
+    --package-target-dir "$(pwd)/workers/unity/Packages" "${EXTRA_ARGS}"

ci/shared-ci.pinned

@@ -1 +1 @@
-e056fe31826b64dbdf51b6974ba36d9908e32f9e
+3af739d9470a84ef58b6f72e57df06387cd0dd27

gdk.pinned

@@ -1 +1 @@
-4e97647d387f5e1eb8f403431a70f891ff837e45
+25fc8cc14bbaa92cfd28cf46a995b5e5f44528ed

init.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -e -u -x -o pipefail
+
+cd "$(dirname "$0")"
+
+./ci/bootstrap.sh

workers/unity/Packages/.gitignore

@@ -0,0 +1,12 @@
+io.improbable.gdk.buildsystem
+io.improbable.gdk.core
+io.improbable.gdk.deploymentlauncher
+io.improbable.gdk.gameobjectcreation
+io.improbable.gdk.mobile
+io.improbable.gdk.playerlifecycle
+io.improbable.gdk.querybasedinteresthelper
+io.improbable.gdk.testutils
+io.improbable.gdk.tools
+io.improbable.gdk.transformsynchronization
+io.improbable.worker.sdk
+io.improbable.worker.sdk.mobile

workers/unity/Packages/manifest.json

@@ -1,14 +1,14 @@
 {
   "dependencies": {
-    "com.improbable.gdk.buildsystem": "file:../../../../gdk-for-unity/workers/unity/Packages/com.improbable.gdk.buildsystem",
-    "com.improbable.gdk.core": "file:../../../../gdk-for-unity/workers/unity/Packages/com.improbable.gdk.core",
-    "com.improbable.gdk.deploymentlauncher": "file:../../../../gdk-for-unity/workers/unity/Packages/com.improbable.gdk.deploymentlauncher",
-    "com.improbable.gdk.gameobjectcreation": "file:../../../../gdk-for-unity/workers/unity/Packages/com.improbable.gdk.gameobjectcreation",
-    "com.improbable.gdk.mobile": "file:../../../../gdk-for-unity/workers/unity/Packages/com.improbable.gdk.mobile",
-    "com.improbable.gdk.playerlifecycle": "file:../../../../gdk-for-unity/workers/unity/Packages/com.improbable.gdk.playerlifecycle",
-    "com.improbable.gdk.testutils": "file:../../../../gdk-for-unity/workers/unity/Packages/com.improbable.gdk.testutils",
-    "com.improbable.gdk.tools": "file:../../../../gdk-for-unity/workers/unity/Packages/com.improbable.gdk.tools",
-    "com.improbable.gdk.transformsynchronization": "file:../../../../gdk-for-unity/workers/unity/Packages/com.improbable.gdk.transformsynchronization",
+    "io.improbable.gdk.buildsystem": "0.2.4",
+    "io.improbable.gdk.core": "0.2.4",
+    "io.improbable.gdk.deploymentlauncher": "0.2.4",
+    "io.improbable.gdk.gameobjectcreation": "0.2.4",
+    "io.improbable.gdk.mobile": "0.0.8",
+    "io.improbable.gdk.playerlifecycle": "0.2.4",
+    "io.improbable.gdk.testutils": "0.2.4",
+    "io.improbable.gdk.tools": "0.2.4",
+    "io.improbable.gdk.transformsynchronization": "0.2.4",
     "com.unity.ads": "2.0.8",
     "com.unity.analytics": "3.3.2",
     "com.unity.package-manager-ui": "2.1.2",
@@ -47,5 +47,14 @@
     "com.unity.modules.wind": "1.0.0",
     "com.unity.modules.xr": "1.0.0"
   },
-  "registry": "https://staging-packages.unity.com"
+  "registry": "https://staging-packages.unity.com",
+  "scopedRegistries": [
+    {
+      "name": "Improbable",
+      "url": "https://npm.improbable.io/gdk-for-unity/",
+      "scopes": [
+        "io.improbable"
+      ]
+    }
+  ]
 }