Skip to content

Commit f2f15fa

Browse files
authored
Merge pull request #115 from TaloDev/asset-store-restructure
Asset Store restructure
2 parents 87a1aff + 2a671d1 commit f2f15fa

File tree

1,199 files changed

+33706
-1138
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,199 files changed

+33706
-1138
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v4
1111
with:
12-
lfs: true
12+
submodules: recursive
1313

1414
- uses: actions/cache@v4
1515
with:
@@ -26,8 +26,4 @@ jobs:
2626
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
2727
with:
2828
githubToken: ${{ secrets.GITHUB_TOKEN }}
29-
packageMode: true
30-
projectPath: Packages/com.trytalo.talo
3129
unityVersion: 6000.0.28f1
32-
scopedRegistryUrl: https://package.openupm.com
33-
registryScopes: 'com.mikeschweitzer.websocket'

.github/workflows/create-release.yml

Lines changed: 12 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -7,57 +7,26 @@ jobs:
77
release:
88
runs-on: ubuntu-latest
99

10-
env:
11-
COMMIT_EMAIL: [email protected]
12-
COMMIT_MESSAGE: "Release https://github.com/TaloDev/unity/releases/tag/${{ github.ref_name }}"
13-
1410
steps:
1511
- uses: actions/checkout@v4
12+
with:
13+
submodules: recursive
1614

1715
- uses: actions/setup-node@v4
1816
with:
1917
node-version: 20
2018

21-
- name: Copy files
22-
run: |
23-
mkdir -p Release/Samples~
24-
cp -a Packages/com.trytalo.talo/. Release
25-
cp -a Assets/Samples/. Release/Samples~
26-
27-
- name: Copy to package repo (main branch)
28-
uses: tudddorrr/github-action-push-to-another-repository@main
29-
if: "!contains(github.event.head_commit.message, '--no-release') && !contains(github.event.head_commit.message, 'pre.')"
30-
env:
31-
SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
32-
with:
33-
source-directory: Release
34-
destination-github-username: TaloDev
35-
destination-repository-name: unity-package
36-
user-email: ${{ env.COMMIT_EMAIL }}
37-
commit-message: ${{ env.COMMIT_MESSAGE }}
38-
39-
- name: Copy to package repo (version branch)
40-
uses: tudddorrr/github-action-push-to-another-repository@main
41-
env:
42-
SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
19+
- name: Install Unity
20+
uses: game-ci/unity-builder@v3
4321
with:
44-
source-directory: Release
45-
destination-github-username: TaloDev
46-
destination-repository-name: unity-package
47-
user-email: ${{ env.COMMIT_EMAIL }}
48-
commit-message: ${{ env.COMMIT_MESSAGE }}
49-
target-branch: ${{ github.ref_name }}
50-
51-
- name: Create artifact
52-
run: |
53-
cd Release
54-
npm pack
22+
unityVersion: 6000.0.28f1
5523

56-
- name: Remove the version from the artifact name
24+
- name: Create Unity Package
5725
run: |
58-
filepath=$(ls Release/*.tgz)
59-
new_filepath=$(echo "$filepath" | sed -E 's/-[0-9]+\.[0-9]+\.[0-9]+\.tgz$/.tgz/')
60-
mv "$filepath" "$new_filepath"
26+
mkdir -p Release
27+
unity-editor -batchmode -nographics -quit \
28+
-projectPath "$(pwd)" \
29+
-exportPackage "Assets/Talo Game Services" "Release/talo.unitypackage"
6130
6231
- name: Upload to itch
6332
uses: manleydev/butler-publish-itchio-action@master
@@ -66,7 +35,7 @@ jobs:
6635
CHANNEL: package
6736
ITCH_GAME: talo-unity
6837
ITCH_USER: sleepystudios
69-
PACKAGE: Release/com.trytalo.talo.tgz
38+
PACKAGE: Release/talo.unitypackage
7039
VERSION: ${{ github.ref_name }}
7140

7241
- name: Create release
@@ -75,4 +44,4 @@ jobs:
7544
with:
7645
generate_release_notes: true
7746
prerelease: ${{ contains(github.event.head_commit.message, 'pre.') }}
78-
files: Release/*.tgz
47+
files: Release/talo.unitypackage

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "Assets/Talo Game Services/Talo/Runtime/Vendor/com.mikeschweitzer.websocket"]
2+
path = Assets/Talo Game Services/Talo/Runtime/Vendor/com.mikeschweitzer.websocket
3+
url = https://github.com/mikerochip/unity-websocket.git

Assets/Samples/ChatDemo/Scripts/ChatUIController.cs

Lines changed: 0 additions & 163 deletions
This file was deleted.

0 commit comments

Comments
 (0)