Skip to content

Commit

Permalink
Merge pull request #14 from kurone-kito/ios-support
Browse files Browse the repository at this point in the history
v0.6.2: Added the experimental VRChat for iOS support of the sample world and improved the CI/CD scripts
  • Loading branch information
kurone-kito authored Oct 13, 2024
2 parents f5d0967 + dbebe4c commit 2975070
Show file tree
Hide file tree
Showing 10 changed files with 208 additions and 14 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/build-listing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ jobs:
repository: vrchat-community/package-list-action
path: ${{ env.pathToCi }}
clean: false
- name: Deploy the global.json file
run: cp "${{ github.workspace }}/global.json" "${{ env.pathToCi }}/"
- name: Load cached data from previous runs
uses: actions/cache@v4
with:
Expand All @@ -55,7 +57,7 @@ jobs:
~/.nuget/packages
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
- name: Build Package Version Listing with Nuke
run: ${{ env.pathToCi }}/build.cmd BuildRepoListing --root ${{ env.pathToCi }} --list-publish-directory $GITHUB_WORKSPACE/${{ env.listPublishDirectory }} --current-package-name ${{ vars.PACKAGE_NAME }}
run: '"${{ env.pathToCi }}/build.cmd" BuildRepoListing --root "${{ env.pathToCi }}" --list-publish-directory "$GITHUB_WORKSPACE/${{ env.listPublishDirectory }}" --current-package-name "${{ vars.PACKAGE_NAME }}"'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Prepare for GitHub Pages deployment
Expand Down
49 changes: 49 additions & 0 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: The CI workflow on push
on:
push:
branches:
- '*'
- '!main'
permissions:
contents: read
jobs:
build:
runs-on: ubuntu-latest
env:
listPublishDirectory: Website
packagePath: Packages/${{ vars.PACKAGE_NAME }}
pathToCi: ci
unityPackage: ${{ vars.PACKAGE_NAME }}-feature.unitypackage
zipFile: ${{ vars.PACKAGE_NAME }}-feature.zip
steps:
- name: Checkout Local Repository
uses: actions/checkout@v4
- name: Zip the Package for testing
run: zip -r "${{ github.workspace }}/${{ env.zipFile }}" .
working-directory: "${{ env.packagePath }}"
- name: Build a list of .meta files for future use
run: find "${{ env.packagePath }}/" -name '*.meta' -type f >> metaList
- name: Make a UnityPackage version of the Package for release
uses: pCYSl5EDgo/create-unitypackage@v1
with:
package-path: ${{ env.unityPackage }}
include-files: metaList
- name: Checkout Automation Repository without removing prior checkouts
uses: actions/checkout@v4
with:
repository: vrchat-community/package-list-action
path: ${{ env.pathToCi }}
clean: false
- name: Deploy the global.json file
run: cp "${{ github.workspace }}/global.json" "${{ env.pathToCi }}/"
- name: Load cached data from previous runs
uses: actions/cache@v4
with:
path: |
${{ env.pathToCi }}/.nuke/temp
~/.nuget/packages
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
- name: Build Package Version Listing with Nuke
run: '"${{ env.pathToCi }}/build.cmd" BuildRepoListing --root "${{ env.pathToCi }}" --list-publish-directory "$GITHUB_WORKSPACE/${{ env.listPublishDirectory }}" --current-package-name "${{ vars.PACKAGE_NAME }}"'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ jobs:
echo "stableVersion=${{ steps.stable-match.outputs.match }}" >> $GITHUB_ENV
echo "unityPackage=${{ vars.PACKAGE_NAME }}-${{ steps.version.outputs.value }}.unitypackage" >> $GITHUB_ENV
echo "version=${{ steps.version.outputs.value }}" >> $GITHUB_ENV
echo "zipFile=${{ vars.PACKAGE_NAME }}-${{ steps.version.outputs.value }}".zip >> $GITHUB_ENV
echo "zipFile=${{ vars.PACKAGE_NAME }}-${{ steps.version.outputs.value }}.zip" >> $GITHUB_ENV
- name: Zip the Package for release
working-directory: "${{ env.packagePath }}"
run: zip -r -9 "${{ github.workspace }}/${{ env.zipFile }}" .
- name: Build a list of .meta files for future use
run: find "${{ env.packagePath }}/" -name \*.meta >> metaList
run: find "${{ env.packagePath }}/" -name '*.meta' -type f >> metaList
- name: Make a UnityPackage version of the Package for release
uses: pCYSl5EDgo/create-unitypackage@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dotnet 6.0.423
dotnet 6.0.427
2 changes: 2 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
"recommendations": [
"editorconfig.editorconfig",
"fernandoescolar.vscode-solution-explorer",
"mariomatheu.syntax-project-pbxproj",
"mrorz.language-gettext",
"redhat.vscode-yaml",
"streetsidesoftware.code-spell-checker",
"visualstudiotoolsforunity.vstuc",
Expand Down
36 changes: 31 additions & 5 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@
"explorer.fileNesting.enabled": true,
"explorer.fileNesting.expand": false,
"explorer.fileNesting.patterns": {
"*": "${capture}.meta, ${capture}.md5",
"*": "${capture}.meta, ${capture}.md5, ${capture}-lock",
"*.db": "${capture}.db.st",
"*.dll": "${capture}.pdb",
"*.md": "${capture}.*.md",
"*.png": "${capture}@*.png",
"*.sln": "*.csproj",
"*.xml": "${capture}.dll",
".gitconfig": ".gitattributes, .gitignore",
".markdownlint.*": ".markdownlint-cli2.*",
".tool-versions": "global.json"
Expand All @@ -16,15 +19,16 @@
"*.asmref": "json",
"*.asset": "yaml",
"*.buildreport": "yaml",
"*.config": "xml",
"*.controller": "yaml",
"*.dwlt": "yaml",
"*.info": "json",
"*.exe.congig": "xml",
"*.index": "json",
"*.info": "json",
"*.inputactions": "json",
"*.lighting": "yaml",
"*.mat": "yaml",
"*.meta": "yaml",
"*.nuget.cache": "json",
"*.outputdata": "json",
"*.physicmaterial": "yaml",
"*.playable": "yaml",
Expand All @@ -33,16 +37,19 @@
"*.scenetemplate": "yaml",
"*.signal": "yaml",
"*.terrainlayer": "yaml",
"*.tlh": "c",
"*.tlh": "cpp",
"*.traceevents": "jsonl",
"*.unity": "yaml",
"*.uss": "css",
"*.uxml": "xml",
".buginfo": "yaml",
".imgbotconfig": "json",
".settings": "plist",
".signature": "json",
"CodeResources": "xml",
"LastSceneManagerSetup.txt": "yaml",
"LibraryFormatVersion.txt": "yaml",
"LICENSE": "plaintext",
"ProjectCache": "yaml",
"ProjectVersion.txt": "yaml",
"XRPackageSettings.asset": "json",
"XRSettings.asset": "json"
Expand Down Expand Up @@ -87,29 +94,48 @@
"tag:unity3d.com,2011:30 mapping",
"tag:unity3d.com,2011:33 mapping",
"tag:unity3d.com,2011:47 mapping",
"tag:unity3d.com,2011:54 mapping",
"tag:unity3d.com,2011:55 mapping",
"tag:unity3d.com,2011:60 mapping",
"tag:unity3d.com,2011:64 mapping",
"tag:unity3d.com,2011:65 mapping",
"tag:unity3d.com,2011:74 mapping",
"tag:unity3d.com,2011:78 mapping",
"tag:unity3d.com,2011:81 mapping",
"tag:unity3d.com,2011:82 mapping",
"tag:unity3d.com,2011:84 mapping",
"tag:unity3d.com,2011:91 mapping",
"tag:unity3d.com,2011:92 mapping",
"tag:unity3d.com,2011:95 mapping",
"tag:unity3d.com,2011:102 mapping",
"tag:unity3d.com,2011:104 mapping",
"tag:unity3d.com,2011:108 mapping",
"tag:unity3d.com,2011:114 mapping",
"tag:unity3d.com,2011:124 mapping",
"tag:unity3d.com,2011:126 mapping",
"tag:unity3d.com,2011:129 mapping",
"tag:unity3d.com,2011:134 mapping",
"tag:unity3d.com,2011:135 mapping",
"tag:unity3d.com,2011:136 mapping",
"tag:unity3d.com,2011:137 mapping",
"tag:unity3d.com,2011:143 mapping",
"tag:unity3d.com,2011:154 mapping",
"tag:unity3d.com,2011:157 mapping",
"tag:unity3d.com,2011:159 mapping",
"tag:unity3d.com,2011:162 mapping",
"tag:unity3d.com,2011:195 mapping",
"tag:unity3d.com,2011:196 mapping",
"tag:unity3d.com,2011:198 mapping",
"tag:unity3d.com,2011:199 mapping",
"tag:unity3d.com,2011:206 mapping",
"tag:unity3d.com,2011:212 mapping",
"tag:unity3d.com,2011:218 mapping",
"tag:unity3d.com,2011:222 mapping",
"tag:unity3d.com,2011:223 mapping",
"tag:unity3d.com,2011:224 mapping",
"tag:unity3d.com,2011:236 mapping",
"tag:unity3d.com,2011:310 mapping",
"tag:unity3d.com,2011:320 mapping",
"tag:unity3d.com,2011:1001 mapping",
"tag:unity3d.com,2011:1002 mapping",
"tag:unity3d.com,2011:1045 mapping",
Expand Down
18 changes: 17 additions & 1 deletion Assets/XR/XRGeneralSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d236b7d11115f2143951f1e14045df39, type: 3}
m_Name: iPhone Settings
m_EditorClassIdentifier:
m_LoaderManagerInstance: {fileID: 0}
m_LoaderManagerInstance: {fileID: 4159851425319384886}
m_InitManagerOnStart: 0
--- !u!114 &-2882982675917644281
MonoBehaviour:
Expand Down Expand Up @@ -93,3 +93,19 @@ MonoBehaviour:
m_AutomaticRunning: 0
m_Loaders:
- {fileID: 11400000, guid: 5aefd9ec7db5d6443be57a8b4867b50a, type: 2}
--- !u!114 &4159851425319384886
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4c3631f5e58749a59194e0cf6baf6d5, type: 3}
m_Name: iPhone Providers
m_EditorClassIdentifier:
m_RequiresSettingsUpdate: 0
m_AutomaticLoading: 0
m_AutomaticRunning: 0
m_Loaders: []
2 changes: 1 addition & 1 deletion Packages/black.kit.launchpadicons/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "black.kit.launchpadicons",
"displayName": "LaunchPad Icons",
"version": "0.6.1",
"version": "0.6.2",
"description": "the icons VPM asset like the VRChat LaunchPad for the VRChat",
"keywords": [
"icons",
Expand Down
103 changes: 101 additions & 2 deletions ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,103 @@ PlayerSettings:
m_Height: 36
m_Kind: 0
m_SubKind:
- m_BuildTarget: iPhone
m_Icons:
- m_Textures: []
m_Width: 180
m_Height: 180
m_Kind: 0
m_SubKind: iPhone
- m_Textures: []
m_Width: 120
m_Height: 120
m_Kind: 0
m_SubKind: iPhone
- m_Textures: []
m_Width: 167
m_Height: 167
m_Kind: 0
m_SubKind: iPad
- m_Textures: []
m_Width: 152
m_Height: 152
m_Kind: 0
m_SubKind: iPad
- m_Textures: []
m_Width: 76
m_Height: 76
m_Kind: 0
m_SubKind: iPad
- m_Textures: []
m_Width: 120
m_Height: 120
m_Kind: 3
m_SubKind: iPhone
- m_Textures: []
m_Width: 80
m_Height: 80
m_Kind: 3
m_SubKind: iPhone
- m_Textures: []
m_Width: 80
m_Height: 80
m_Kind: 3
m_SubKind: iPad
- m_Textures: []
m_Width: 40
m_Height: 40
m_Kind: 3
m_SubKind: iPad
- m_Textures: []
m_Width: 87
m_Height: 87
m_Kind: 1
m_SubKind: iPhone
- m_Textures: []
m_Width: 58
m_Height: 58
m_Kind: 1
m_SubKind: iPhone
- m_Textures: []
m_Width: 29
m_Height: 29
m_Kind: 1
m_SubKind: iPhone
- m_Textures: []
m_Width: 58
m_Height: 58
m_Kind: 1
m_SubKind: iPad
- m_Textures: []
m_Width: 29
m_Height: 29
m_Kind: 1
m_SubKind: iPad
- m_Textures: []
m_Width: 60
m_Height: 60
m_Kind: 2
m_SubKind: iPhone
- m_Textures: []
m_Width: 40
m_Height: 40
m_Kind: 2
m_SubKind: iPhone
- m_Textures: []
m_Width: 40
m_Height: 40
m_Kind: 2
m_SubKind: iPad
- m_Textures: []
m_Width: 20
m_Height: 20
m_Kind: 2
m_SubKind: iPad
- m_Textures: []
m_Width: 1024
m_Height: 1024
m_Kind: 4
m_SubKind: App Store
m_BuildTargetBatching:
- m_BuildTarget: Standalone
m_StaticBatching: 1
Expand Down Expand Up @@ -410,7 +507,7 @@ PlayerSettings:
- m_BuildTarget: PS4Player
m_GraphicsJobs: 1
- m_BuildTarget: iOSSupport
m_GraphicsJobs: 0
m_GraphicsJobs: 1
- m_BuildTarget: WindowsStandaloneSupport
m_GraphicsJobs: 1
- m_BuildTarget: XboxOnePlayer
Expand All @@ -432,7 +529,7 @@ PlayerSettings:
m_Automatic: 0
- m_BuildTarget: iOSSupport
m_APIs: 10000000
m_Automatic: 1
m_Automatic: 0
- m_BuildTarget: AppleTVSupport
m_APIs: 10000000
m_Automatic: 1
Expand Down Expand Up @@ -739,6 +836,7 @@ PlayerSettings:
VisionOS: UNITY_POST_PROCESSING_STACK_V2
WebGL: UNITY_POST_PROCESSING_STACK_V2
XboxOne: UNITY_POST_PROCESSING_STACK_V2
iPhone: UDONSHARP;UDON;VRC_SDK_VRCSDK3
tvOS: UNITY_POST_PROCESSING_STACK_V2
additionalCompilerArguments: {}
platformArchitecture: {}
Expand Down Expand Up @@ -773,6 +871,7 @@ PlayerSettings:
apiCompatibilityLevelPerPlatform:
Android: 3
Standalone: 3
iPhone: 3
m_RenderingPath: 1
m_MobileRenderingPath: 1
metroPackageName: Template_3D
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"rollForward": "latestMinor",
"version": "6.0.423"
"version": "6.0.427"
}
}

0 comments on commit 2975070

Please sign in to comment.