Working on CI...

bdunderscore · Sep 10, 2023 · f37af88 · f37af88
1 parent 408fce6
commit f37af88
Show file tree

Hide file tree

Showing 26 changed files with 32 additions and 3 deletions.
diff --git a/.github/ProjectRoot/Packages/vpm-manifest.json b/.github/ProjectRoot/Packages/vpm-manifest.json
@@ -0,0 +1,29 @@
+{
+  "dependencies": {
+    "com.vrchat.avatars": {
+      "version": "3.2.0"
+    },
+    "com.vrchat.core.vpm-resolver": {
+      "version": "0.1.19"
+    },
+    "vrchat.blackstartx.gesture-manager": {
+      "version": "3.8.4"
+    }
+  },
+  "locked": {
+    "com.vrchat.avatars": {
+      "version": "3.2.0",
+      "dependencies": {
+        "com.vrchat.base": "3.2.0"
+      }
+    },
+    "com.vrchat.base": {
+      "version": "3.2.0",
+      "dependencies": {}
+    },
+    "com.vrchat.core.vpm-resolver": {
+      "version": "0.1.19",
+      "dependencies": {}
+    }
+  }
+}
diff --git a/.github/ProjectSettings/AudioManager.asset → ...ctRoot/ProjectSettings/AudioManager.asset b/.github/ProjectSettings/AudioManager.asset → ...ctRoot/ProjectSettings/AudioManager.asset
diff --git a/...ectSettings/BurstAotSettings_Android.json → ...ectSettings/BurstAotSettings_Android.json b/...ectSettings/BurstAotSettings_Android.json → ...ectSettings/BurstAotSettings_Android.json
diff --git a/...s/BurstAotSettings_StandaloneWindows.json → ...s/BurstAotSettings_StandaloneWindows.json b/...s/BurstAotSettings_StandaloneWindows.json → ...s/BurstAotSettings_StandaloneWindows.json
diff --git a/...ProjectSettings/ClusterInputManager.asset → ...ProjectSettings/ClusterInputManager.asset b/...ProjectSettings/ClusterInputManager.asset → ...ProjectSettings/ClusterInputManager.asset
diff --git a/...hub/ProjectSettings/DynamicsManager.asset → ...oot/ProjectSettings/DynamicsManager.asset b/...hub/ProjectSettings/DynamicsManager.asset → ...oot/ProjectSettings/DynamicsManager.asset
diff --git a/...ProjectSettings/EditorBuildSettings.asset → ...ProjectSettings/EditorBuildSettings.asset b/...ProjectSettings/EditorBuildSettings.asset → ...ProjectSettings/EditorBuildSettings.asset
diff --git a/.github/ProjectSettings/EditorSettings.asset → ...Root/ProjectSettings/EditorSettings.asset b/.github/ProjectSettings/EditorSettings.asset → ...Root/ProjectSettings/EditorSettings.asset
diff --git a/...ub/ProjectSettings/GraphicsSettings.asset → ...ot/ProjectSettings/GraphicsSettings.asset b/...ub/ProjectSettings/GraphicsSettings.asset → ...ot/ProjectSettings/GraphicsSettings.asset
diff --git a/.github/ProjectSettings/InputManager.asset → ...ctRoot/ProjectSettings/InputManager.asset b/.github/ProjectSettings/InputManager.asset → ...ctRoot/ProjectSettings/InputManager.asset
diff --git a/.github/ProjectSettings/NavMeshAreas.asset → ...ctRoot/ProjectSettings/NavMeshAreas.asset b/.github/ProjectSettings/NavMeshAreas.asset → ...ctRoot/ProjectSettings/NavMeshAreas.asset
diff --git a/...jectSettings/PackageManagerSettings.asset → ...jectSettings/PackageManagerSettings.asset b/...jectSettings/PackageManagerSettings.asset → ...jectSettings/PackageManagerSettings.asset
diff --git a/...nity.testtools.codecoverage/Settings.json → ...nity.testtools.codecoverage/Settings.json b/...nity.testtools.codecoverage/Settings.json → ...nity.testtools.codecoverage/Settings.json
diff --git a/...gs/Packages/com.vrchat.base/settings.json → ...gs/Packages/com.vrchat.base/settings.json b/...gs/Packages/com.vrchat.base/settings.json → ...gs/Packages/com.vrchat.base/settings.json
diff --git a/...b/ProjectSettings/Physics2DSettings.asset → ...t/ProjectSettings/Physics2DSettings.asset b/...b/ProjectSettings/Physics2DSettings.asset → ...t/ProjectSettings/Physics2DSettings.asset
diff --git a/.github/ProjectSettings/PresetManager.asset → ...tRoot/ProjectSettings/PresetManager.asset b/.github/ProjectSettings/PresetManager.asset → ...tRoot/ProjectSettings/PresetManager.asset
diff --git a/...hub/ProjectSettings/ProjectSettings.asset → ...oot/ProjectSettings/ProjectSettings.asset b/...hub/ProjectSettings/ProjectSettings.asset → ...oot/ProjectSettings/ProjectSettings.asset
diff --git a/.github/ProjectSettings/ProjectVersion.txt → ...ctRoot/ProjectSettings/ProjectVersion.txt b/.github/ProjectSettings/ProjectVersion.txt → ...ctRoot/ProjectSettings/ProjectVersion.txt
diff --git a/...hub/ProjectSettings/QualitySettings.asset → ...oot/ProjectSettings/QualitySettings.asset b/...hub/ProjectSettings/QualitySettings.asset → ...oot/ProjectSettings/QualitySettings.asset
diff --git a/.github/ProjectSettings/TagManager.asset → ...jectRoot/ProjectSettings/TagManager.asset b/.github/ProjectSettings/TagManager.asset → ...jectRoot/ProjectSettings/TagManager.asset
diff --git a/.github/ProjectSettings/TimeManager.asset → ...ectRoot/ProjectSettings/TimeManager.asset b/.github/ProjectSettings/TimeManager.asset → ...ectRoot/ProjectSettings/TimeManager.asset
diff --git a/...rojectSettings/UnityConnectSettings.asset → ...rojectSettings/UnityConnectSettings.asset b/...rojectSettings/UnityConnectSettings.asset → ...rojectSettings/UnityConnectSettings.asset
diff --git a/.github/ProjectSettings/VFXManager.asset → ...jectRoot/ProjectSettings/VFXManager.asset b/.github/ProjectSettings/VFXManager.asset → ...jectRoot/ProjectSettings/VFXManager.asset
diff --git a/.github/ProjectSettings/XRSettings.asset → ...jectRoot/ProjectSettings/XRSettings.asset b/.github/ProjectSettings/XRSettings.asset → ...jectRoot/ProjectSettings/XRSettings.asset
diff --git a/.github/ProjectSettings/lilToonSetting.json → ...tRoot/ProjectSettings/lilToonSetting.json b/.github/ProjectSettings/lilToonSetting.json → ...tRoot/ProjectSettings/lilToonSetting.json
diff --git a/.github/workflows/gameci.yml b/.github/workflows/gameci.yml
@@ -49,9 +49,9 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
 
       - run: |
-          mkdir Packages/nadena.dev.ndmf -p
-          mv [^P]* Packages/nadena.dev.ndmf
-          mv .github/ProjectSettings .
+          mkdir .github/ProjectRoot/Packages/nadena.dev.ndmf -p
+          mv [^P]* .github/ProjectRoot/Packages/nadena.dev.ndmf
+          mv .github/ProjectRoot/* .
       
       - uses: anatawa12/sh-actions/resolve-vpm-packages@master