Skip to content
This repository was archived by the owner on Oct 20, 2021. It is now read-only.

Commit ee1234c

Browse files
zeroZshadowzeroZshadow
authored
Unity 2019.2.0f1 (#229)
* Allow bootstrap to skip overwriting the gdk * Upgrade to 2019.2.0f1 * fix bootstrap checkout * Pin gdk and shared-ci properly * re-pin shared-ci * Update buildkite queue * re-pin latest gdk * Changelog * re-pin GDK * Disable Burst AOT Linux x64
1 parent ae9dae2 commit ee1234c

File tree

13 files changed

+73
-36
lines changed

13 files changed

+73
-36
lines changed

‎.buildkite/premerge.steps.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ common: &common
1313
- "environment=production"
1414
- "permission_set=builder"
1515
- "platform=windows"
16-
- "queue=v3-1562257704-92dadf3bbbe69f0b-------z"
16+
- "queue=v3-1566854625-09d22e84794c4a34-------z"
1717
- "scaler_version=2"
1818
- "minimum_instances=1"
1919
- "agent_count=1"

‎.buildkite/release-qa.steps.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ common: &common
1313
- "environment=production"
1414
- "permission_set=builder"
1515
- "platform=windows"
16-
- "queue=v3-1562257704-92dadf3bbbe69f0b-------z"
16+
- "queue=v3-1566854625-09d22e84794c4a34-------z"
1717
- "scaler_version=2"
1818
- "minimum_instances=1"
1919
- "agent_count=1"

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,16 @@
22

33
## Unreleased
44

5+
### Changed
6+
7+
- Upgraded the project to be compatible with `2019.2.0f1`.
8+
59
## `0.2.7` - 2019-08-19
610

711
### Changed
812

913
- Upgraded to GDK for Unity version `0.2.7`
14+
1015
### Breaking Changes
1116

1217
- Moved `ChosenDeploymentAlphaLocatorFlow` and `SessionConnectionFlowInitializer` into the `Fps.Connection` namespace and made them `public`. [#225](https://github.com/spatialos/gdk-for-unity-fps-starter-project/pull/225)

‎ci/UnityEditorHash.txt‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎ci/bootstrap.sh‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ echo "--- Bootstrapping :boot:"
2323

2424
SHARED_CI_DIR="$(pwd)/.shared-ci"
2525
CLONE_URL="[email protected]:spatialos/gdk-for-unity-shared-ci.git"
26-
PINNED_SHARED_CI_VERSION=$(cat ./ci/shared-ci.pinned)
26+
PINNED_SHARED_CI_BRANCH=$(cat ./ci/shared-ci.pinned | cut -d' ' -f 1)
27+
PINNED_SHARED_CI_VERSION=$(cat ./ci/shared-ci.pinned | cut -d' ' -f 2)
2728

2829
# Clone the HEAD of the shared CI repo into ".shared-ci"
2930

@@ -37,40 +38,47 @@ mkdir "${SHARED_CI_DIR}"
3738
pushd "${SHARED_CI_DIR}"
3839
git init
3940
git remote add origin "${CLONE_URL}"
40-
git fetch --depth 20 origin master
41+
git fetch --depth 20 origin "${PINNED_SHARED_CI_BRANCH}"
4142
git checkout "${PINNED_SHARED_CI_VERSION}"
4243
popd
4344

4445
# Clone the GDK for Unity repository
4546

4647
CLONE_URI="[email protected]:spatialos/gdk-for-unity.git"
4748
TARGET_DIRECTORY="$(realpath $(pwd)/../gdk-for-unity)"
48-
PINNED_VERSION=$(cat ./gdk.pinned)
49+
PINNED_BRANCH=$(cat ./gdk.pinned | cut -d' ' -f 1)
50+
PINNED_VERSION=$(cat ./gdk.pinned | cut -d' ' -f 2)
51+
SKIP_GDK=false
4952

5053
if [[ -z ${BUILDKITE:-} ]]; then
5154
echo "Warning: About to delete ${TARGET_DIRECTORY}. Please confirm. (Default is Cancel)"
52-
read -p "Y/N > " -r
55+
read -p "Y/N/S > " -r
5356
echo # (optional) move to a new line
5457
if [[ $REPLY =~ ^[Yy]$ ]]; then
5558
echo "Deleting..."
59+
elif [[ $REPLY =~ ^[Ss]$ ]]; then
60+
echo "Skipping..."
61+
SKIP_GDK=true
5662
else
5763
exit 1
5864
fi
5965
fi
6066

61-
rm -rf "${TARGET_DIRECTORY}"
67+
if [ "$SKIP_GDK" = false ] ; then
68+
rm -rf "${TARGET_DIRECTORY}"
6269

63-
mkdir "${TARGET_DIRECTORY}"
70+
mkdir "${TARGET_DIRECTORY}"
6471

65-
# Workaround for being unable to clone a specific commit with depth of 1.
66-
pushd "${TARGET_DIRECTORY}"
67-
git init
68-
git remote add origin "${CLONE_URI}"
69-
git fetch --depth 20 origin develop
70-
git checkout "${PINNED_VERSION}"
71-
echo "--- Hit init :right-facing_fist::red_button:"
72-
./init.sh
73-
popd
72+
# Workaround for being unable to clone a specific commit with depth of 1.
73+
pushd "${TARGET_DIRECTORY}"
74+
git init
75+
git remote add origin "${CLONE_URI}"
76+
git fetch --depth 20 origin "${PINNED_BRANCH}"
77+
git checkout "${PINNED_VERSION}"
78+
echo "--- Hit init :right-facing_fist::red_button:"
79+
./init.sh
80+
popd
81+
fi
7482

7583
echo "--- Symlinking packages :link::package:"
7684

‎ci/shared-ci.pinned‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4085a20354d1e41502de36e1330bd589576edb58
1+
master 16af8b4696032d897ba4d8075eaa61355f06f488

‎gdk.pinned‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
06858069686faffce4c93212e2b6d160e40a9f09
1+
develop 4dbd8790baf3a334249742e3d8c1ab724a36314c

‎workers/unity/Assets/Fps/Tests/EditmodeTests/Fps.EditmodeTests.asmdef‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,19 @@
66
"GUID:3239558782c42184ea911608b6e56623",
77
"GUID:edb3612c44ad0d24988d387581fd5fbe"
88
],
9-
"optionalUnityReferences": [
10-
"TestAssemblies"
11-
],
129
"includePlatforms": [
1310
"Editor"
1411
],
1512
"excludePlatforms": [],
1613
"allowUnsafeCode": false,
17-
"overrideReferences": false,
18-
"precompiledReferences": [],
19-
"autoReferenced": true,
20-
"defineConstraints": [],
14+
"overrideReferences": true,
15+
"precompiledReferences": [
16+
"nunit.framework.dll",
17+
"Improbable.Worker.CInterop.dll"
18+
],
19+
"autoReferenced": false,
20+
"defineConstraints": [
21+
"UNITY_INCLUDE_TESTS"
22+
],
2123
"versionDefines": []
2224
}

‎workers/unity/Packages/manifest.json‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
{
22
"dependencies": {
3+
"com.unity.ide.rider": "1.0.8",
4+
"com.unity.package-manager-ui": "2.2.0",
5+
"com.unity.postprocessing": "2.1.4",
6+
"com.unity.ugui": "1.0.0",
37
"io.improbable.gdk.buildsystem": "0.2.7",
48
"io.improbable.gdk.core": "0.2.7",
59
"io.improbable.gdk.debug": "0.2.7",
@@ -18,23 +22,22 @@
1822
"io.improbable.gdk.testutils": "0.2.7",
1923
"io.improbable.gdk.tools": "0.2.7",
2024
"io.improbable.gdk.transformsynchronization": "0.2.7",
21-
"com.unity.package-manager-ui": "2.1.2",
22-
"com.unity.postprocessing": "2.1.4",
2325
"com.unity.modules.ai": "1.0.0",
2426
"com.unity.modules.animation": "1.0.0",
2527
"com.unity.modules.audio": "1.0.0",
2628
"com.unity.modules.imgui": "1.0.0",
2729
"com.unity.modules.jsonserialize": "1.0.0",
2830
"com.unity.modules.particlesystem": "1.0.0",
2931
"com.unity.modules.physics": "1.0.0",
32+
"com.unity.modules.physics2d": "1.0.0",
3033
"com.unity.modules.ui": "1.0.0",
3134
"com.unity.modules.unityanalytics": "1.0.0",
3235
"com.unity.modules.unitywebrequest": "1.0.0",
3336
"com.unity.modules.vr": "1.0.0",
3437
"com.unity.modules.wind": "1.0.0",
3538
"com.unity.modules.xr": "1.0.0"
3639
},
37-
"registry": "https://staging-packages.unity.com",
40+
"registry": "https://packages.unity.com",
3841
"scopedRegistries": [
3942
{
4043
"name": "Improbable",
@@ -44,4 +47,4 @@
4447
]
4548
}
4649
]
47-
}
50+
}

‎workers/unity/ProjectSettings/BurstAotSettings_StandaloneLinux64.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"MonoBehaviour": {
3+
"m_Enabled": true,
4+
"m_EditorHideFlags": 0,
5+
"m_Name": "",
6+
"m_EditorClassIdentifier": "Unity.Burst.Editor:Unity.Burst.Editor:BurstPlatformAotSettings",
7+
"DisableOptimisations": false,
8+
"DisableSafetyChecks": true,
9+
"DisableBurstCompilation": true
10+
}
11+
}

0 commit comments

Comments
 (0)