Skip to content

Commit fb55d52

Browse files
authored
Merge pull request #8 from ashblue/develop
Cut 2.0 Release
2 parents 92bde79 + ddaf23b commit fb55d52

File tree

61 files changed

+6495
-4420
lines changed

Some content is hidden

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

61 files changed

+6495
-4420
lines changed

.github/workflows/commitlint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
commitlint:
66
runs-on: ubuntu-latest
77
steps:
8-
- uses: actions/checkout@v2
8+
- uses: actions/checkout@v3
99
with:
1010
fetch-depth: 0
11-
- uses: wagoid/commitlint-github-action@v3
11+
- uses: wagoid/commitlint-github-action@v5

.github/workflows/nightly-build.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
name: Nightly Build
2+
permissions:
3+
contents: write
24
on:
35
push:
46
branches:
@@ -7,11 +9,11 @@ jobs:
79
deployNightly:
810
runs-on: ubuntu-latest
911
steps:
10-
- uses: actions/checkout@v2
11-
- uses: actions/setup-node@v2
12+
- uses: actions/checkout@v3
13+
- uses: actions/setup-node@v3
1214
with:
13-
node-version: '14'
14-
- run: npm install
15+
node-version: 16
16+
- run: HUSKY=0 npm ci
1517
- run: npm run build
1618
- name: Deploy nightly branch
1719
run: sh ./publish-nightly.sh

.github/workflows/workflow.yml

Lines changed: 33 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,40 @@
1-
name: CI
2-
on: push
1+
name: Release
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- master
8+
9+
permissions:
10+
contents: read
11+
312
jobs:
4-
test:
13+
release:
14+
name: Release
515
runs-on: ubuntu-latest
16+
permissions:
17+
contents: write
18+
issues: write
19+
pull-requests: write
20+
id-token: write
621
steps:
7-
- uses: actions/checkout@v2
8-
- uses: actions/setup-node@v2
22+
- name: Checkout
23+
uses: actions/checkout@v3
924
with:
10-
node-version: '14'
11-
- run: npm install
12-
- run: npm run build
25+
fetch-depth: 0
26+
persist-credentials: false
27+
- name: Setup Node.js
28+
uses: actions/setup-node@v3
29+
with:
30+
node-version: 16
31+
- name: Install dependencies
32+
run: HUSKY=0 npm ci && npm run build
33+
- name: Verify the integrity of provenance attestations and registry signatures for installed dependencies
34+
run: npm audit signatures
1335
- name: Release
1436
env:
37+
GH_TOKEN: ${{ secrets.GH_TOKEN }}
38+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1539
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
16-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
17-
run: npm run semantic-release
40+
run: npm run semantic-release

.gitignore

Lines changed: 41 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,30 @@
1-
[Ll]ibrary/
2-
[Tt]emp/
3-
[Oo]bj/
4-
[Bb]uild/
5-
[Bb]uilds/
6-
Assets/AssetStoreTools*
1+
/[Ll]ibrary/
2+
/[Tt]emp/
3+
/[Oo]bj/
4+
/[Bb]uild/
5+
/[Bb]uilds/
6+
/[Ll]ogs/
7+
/[Uu]ser[Ss]ettings/
8+
CodeCoverage/
9+
UIElementsSchema/
10+
11+
# MemoryCaptures can get excessive in size.
12+
# They also could contain extremely sensitive data
13+
/[Mm]emoryCaptures/
14+
15+
# Recordings can get excessive in size
16+
/[Rr]ecordings/
17+
18+
/[Aa]ssets/AssetStoreTools*
19+
20+
# Autogenerated Jetbrains Rider plugin
21+
/[Aa]ssets/Plugins/Editor/JetBrains*
722

823
# Visual Studio cache directory
9-
/.vs/
24+
.vs/
25+
26+
# Gradle cache directory
27+
.gradle/
1028

1129
# Autogenerated VS/MD/Consulo solution and project files
1230
ExportedObj/
@@ -22,20 +40,33 @@ ExportedObj/
2240
*.booproj
2341
*.svd
2442
*.pdb
43+
*.mdb
44+
*.opendb
45+
*.VC.db
2546

2647
# Unity3D generated meta files
2748
*.pidb.meta
2849
*.pdb.meta
50+
*.mdb.meta
2951

3052
# Unity3D Generated File On Crash Reports
3153
sysinfo.txt
3254

3355
# Builds
3456
*.apk
57+
*.aab
3558
*.unitypackage
36-
/Logs/Packages-Update.log
37-
Logs/
38-
CodeCoverage/
59+
*.app
60+
61+
# Crashlytics generated file
62+
crashlytics-build.properties
63+
64+
# Packed Addressables
65+
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*
66+
67+
# Temporary auto-generated Android Assets
68+
/[Aa]ssets/[Ss]treamingAssets/aa.meta
69+
/[Aa]ssets/[Ss]treamingAssets/aa/*
3970

4071
# Node.js
4172
node_modules

.husky/commit-msg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
2-
. "$(dirname "$0")/_/husky.sh"
1+
#!/usr/bin/env sh
2+
. "$(dirname -- "$0")/_/husky.sh"
33

4-
npx --no-install commitlint --edit $1
4+
npx --no -- commitlint --edit ${1}

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.16.0
1+
16.17.0

.oyster.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"quest manager",
88
"quest tasks"
99
],
10-
"oysterVersion": "2.1.0",
10+
"oysterVersion": "3.0.2",
1111
"packageName": "com.fluid.quest-journal",
1212
"packageScope": "com.fluid",
1313
"unityVersion": "2020.1",

0 commit comments

Comments
 (0)