Skip to content

Commit 8567fea

Browse files
authored
Merge pull request #22 from kurone-kito/cumulative-updates
v0.11.2: Some potential bug fixes
2 parents d5690b2 + 82acd29 commit 8567fea

22 files changed

+266
-156
lines changed

.github/CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Language: **🇬🇧** | [🇯🇵](./CONTRIBUTING.ja.md) | [🇨🇳](./CONTRIB
88
follow it in all your interactions with the project.
99
2. When contributing to this repository,
1010
please first discuss the change you wish to make via
11-
[Issues](https://github.com/kurone-kito/udonsharp-toyboxs/issues) or any
11+
[Issues](https://github.com/kurone-kito/udonsharp-toybox/issues) or any
1212
other method with the owners of this repository before making a change.
1313
3. If your idea can be shown **with a minor fix, please use directly the
14-
[pull request](https://github.com/kurone-kito/udonsharp-toyboxs/pulls)**.
14+
[pull request](https://github.com/kurone-kito/udonsharp-toybox/pulls)**.
1515
- This repository sometimes operates with a one-to-one tie between pull
1616
requests and releases, which is **not required**.
1717
We welcome your pull requests.

.github/CONTRIBUTING.zh.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ Language: [🇬🇧](./CONTRIBUTING.md) | [🇯🇵](./CONTRIBUTING.ja.md) | **
66

77
1. 请注意我们有[行为准则](./CODE_OF_CONDUCT.zh.md),请在与项目的所有互动中遵循。
88
2. 在为此存储库做出贡献时,请首先在进行更改之前与该存储库的所有者讨论您希望通过问题或任何其他方法进行的更改。
9-
3. 如果您的想法可以通过**小修复显示,请直接使用[拉取请求](https://github.com/kurone-kito/udonsharp-toyboxs/pulls)**
9+
3. 如果您的想法可以通过**小修复显示,请直接使用[拉取请求](https://github.com/kurone-kito/udonsharp-toybox/pulls)**
1010
- 本版本库有时会在拉取请求和发布之间建立一对一的绑定关系,但这并**不是必须的**。我们欢迎您的拉取请求。
1111
4. 在此存储库中,建议**使用[英语或日语](https://translate.google.com/)进行**讨论。

.github/dependabot.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,5 @@ updates:
44
labels:
55
- dependencies
66
package-ecosystem: github-actions
7-
reviewers:
8-
- kurone-kito
9-
assignees:
10-
- kurone-kito
117
schedule:
128
interval: monthly

.github/workflows/build-listing.yml

Lines changed: 15 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
name: Build Repo Listing
2-
3-
env:
4-
listPublishDirectory: Website
5-
pathToCi: ci
6-
72
on:
83
release:
94
types:
@@ -22,6 +17,7 @@ on:
2217

2318
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
2419
permissions:
20+
actions: write
2521
contents: read
2622
id-token: write
2723
pages: write
@@ -32,44 +28,25 @@ concurrency:
3228
group: pages
3329

3430
jobs:
35-
build-listing:
31+
website:
32+
secrets: inherit
33+
uses: ./.github/workflows/build-website.yml
34+
with:
35+
listPublishDirectory: Website
36+
pathToCi: ci
37+
38+
deploy:
39+
needs: website
3640
environment:
3741
name: github-pages
3842
url: ${{ steps.deployment.outputs.page_url }}
39-
name: build-listing
4043
runs-on: ubuntu-latest
4144
steps:
42-
- name: Checkout Local Repository
43-
uses: actions/checkout@v4
44-
- name: Checkout Automation Repository without removing prior checkouts
45-
uses: actions/checkout@v4
46-
with:
47-
clean: false
48-
path: ${{ env.pathToCi }}
49-
repository: vrchat-community/package-list-action
50-
- name: Deploy the global.json file
51-
run: cp "${{ github.workspace }}/global.json" "${{ env.pathToCi }}/"
52-
- name: Load cached data from previous runs
53-
uses: actions/cache@v4
54-
with:
55-
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
56-
path: |
57-
${{ env.pathToCi }}/.nuke/temp
58-
~/.nuget/packages
59-
- name: Correct the documentation metadata
60-
uses: nikeee/[email protected]
61-
with:
62-
args: metadata Documentation/docfx.json
63-
- name: Build the documentation
64-
uses: nikeee/[email protected]
45+
- name: Download listing artifact
46+
uses: actions/download-artifact@v4
6547
with:
66-
args: build Documentation/docfx.json
67-
- name: move the documentation to the publish directory
68-
run: cp -r Documentation/_site ${{ env.listPublishDirectory }}/docs
69-
- env:
70-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
71-
name: Build Package Version Listing with Nuke
72-
run: '"${{ env.pathToCi }}/build.cmd" BuildRepoListing --root "${{ env.pathToCi }}" --list-publish-directory "$GITHUB_WORKSPACE/${{ env.listPublishDirectory }}" --current-package-name "${{ vars.PACKAGE_NAME }}"'
48+
name: listing-site
49+
path: Website
7350
- name: Prepare for GitHub Pages deployment
7451
uses: actions/configure-pages@v5
7552
with:
@@ -78,7 +55,7 @@ jobs:
7855
- name: Upload the VPM Listing Website to GitHub Pages artifacts
7956
uses: actions/upload-pages-artifact@v3
8057
with:
81-
path: ${{ env.listPublishDirectory }}
58+
path: Website
8259
- id: deployment
8360
name: Deploy the uploaded VPM Listing Website to GitHub Pages
8461
uses: actions/deploy-pages@v4
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: Build the website
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
listPublishDirectory:
7+
required: true
8+
type: string
9+
pathToCi:
10+
required: true
11+
type: string
12+
zipFile:
13+
required: false
14+
type: string
15+
default: ''
16+
unityPackage:
17+
required: false
18+
type: string
19+
default: ''
20+
permissions:
21+
actions: write
22+
contents: read
23+
jobs:
24+
build:
25+
runs-on: ubuntu-latest
26+
steps:
27+
- name: Checkout Local Repository
28+
uses: actions/checkout@v4
29+
- name: Checkout Automation Repository without removing prior checkouts
30+
uses: actions/checkout@v4
31+
with:
32+
clean: false
33+
path: ${{ inputs.pathToCi }}
34+
repository: vrchat-community/package-list-action
35+
- name: Deploy the global.json file
36+
run: cp "${{ github.workspace }}/global.json" "${{ inputs.pathToCi }}/"
37+
- name: Load cached data from previous runs
38+
uses: actions/cache@v4
39+
with:
40+
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
41+
path: |
42+
${{ inputs.pathToCi }}/.nuke/temp
43+
~/.nuget/packages
44+
restore-keys: |
45+
${{ runner.os }}-
46+
- env:
47+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
48+
name: Build Package Version Listing with Nuke
49+
run: '"${{ inputs.pathToCi }}/build.cmd" BuildRepoListing --root "${{ inputs.pathToCi }}" --list-publish-directory "$GITHUB_WORKSPACE/${{ inputs.listPublishDirectory }}" --current-package-name "${{ vars.PACKAGE_NAME }}"'
50+
- name: Upload listing artifact
51+
uses: actions/upload-artifact@v4
52+
with:
53+
if-no-files-found: error
54+
name: listing-site
55+
path: ${{ inputs.listPublishDirectory }}
56+
retention-days: 1
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: Build Package Artifacts
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
packagePath:
7+
required: true
8+
type: string
9+
unityPackage:
10+
required: true
11+
type: string
12+
zipFile:
13+
required: true
14+
type: string
15+
permissions:
16+
actions: write
17+
contents: read
18+
jobs:
19+
build:
20+
runs-on: ubuntu-latest
21+
steps:
22+
- name: Checkout Local Repository
23+
uses: actions/checkout@v4
24+
- name: Zip the Package
25+
run: zip -r -9 "${{ github.workspace }}/${{ inputs.zipFile }}" .
26+
working-directory: "${{ inputs.packagePath }}"
27+
- name: Build a list of .meta files for future use
28+
run: find "${{ inputs.packagePath }}/" -name '*.meta' -type f >> metaList
29+
- name: Make a UnityPackage version of the Package
30+
uses: pCYSl5EDgo/[email protected]
31+
with:
32+
include-files: metaList
33+
package-path: ${{ inputs.unityPackage }}
34+
- name: Upload package archive
35+
uses: actions/upload-artifact@v4
36+
with:
37+
if-no-files-found: error
38+
name: ${{ inputs.zipFile }}
39+
path: ${{ inputs.zipFile }}
40+
retention-days: 1
41+
- name: Upload UnityPackage
42+
uses: actions/upload-artifact@v4
43+
with:
44+
if-no-files-found: error
45+
name: ${{ inputs.unityPackage }}
46+
path: ${{ inputs.unityPackage }}
47+
retention-days: 1

.github/workflows/push.yml

Lines changed: 30 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,41 @@
1+
concurrency:
2+
group: ${{ github.workflow }}-${{ github.ref }}
3+
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
14
name: The CI workflow on push
25
on:
36
push:
47
branches:
58
- '*'
69
- '!main'
7-
permissions:
8-
contents: read
10+
pull_request:
911
jobs:
10-
build:
11-
env:
12-
listPublishDirectory: Website
13-
packagePath: Packages/${{ vars.PACKAGE_NAME }}
14-
pathToCi: ci
15-
unityPackage: ${{ vars.PACKAGE_NAME }}-feature.unitypackage
16-
zipFile: ${{ vars.PACKAGE_NAME }}-feature.zip
12+
lint:
1713
runs-on: ubuntu-latest
1814
steps:
1915
- name: Checkout Local Repository
2016
uses: actions/checkout@v4
21-
- name: Zip the Package for testing
22-
run: zip -r "${{ github.workspace }}/${{ env.zipFile }}" .
23-
working-directory: "${{ env.packagePath }}"
24-
- name: Build a list of .meta files for future use
25-
run: find "${{ env.packagePath }}/" -name '*.meta' -type f >> metaList
26-
- name: Make a UnityPackage version of the Package for release
27-
uses: pCYSl5EDgo/create-unitypackage@v1
28-
with:
29-
include-files: metaList
30-
package-path: ${{ env.unityPackage }}
31-
- name: Checkout Automation Repository without removing prior checkouts
32-
uses: actions/checkout@v4
33-
with:
34-
clean: false
35-
path: ${{ env.pathToCi }}
36-
repository: vrchat-community/package-list-action
37-
- name: Deploy the global.json file
38-
run: cp "${{ github.workspace }}/global.json" "${{ env.pathToCi }}/"
39-
- name: Load cached data from previous runs
40-
uses: actions/cache@v4
41-
with:
42-
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
43-
path: |
44-
${{ env.pathToCi }}/.nuke/temp
45-
~/.nuget/packages
46-
- env:
47-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
48-
name: Build Package Version Listing with Nuke
49-
run: '"${{ env.pathToCi }}/build.cmd" BuildRepoListing --root "${{ env.pathToCi }}" --list-publish-directory "$GITHUB_WORKSPACE/${{ env.listPublishDirectory }}" --current-package-name "${{ vars.PACKAGE_NAME }}"'
17+
- name: Run cspell
18+
uses: streetsidesoftware/cspell-action@v7
19+
- name: Run markdownlint
20+
uses: DavidAnson/markdownlint-cli2-action@v20
21+
package:
22+
permissions:
23+
actions: write
24+
contents: read
25+
secrets: inherit
26+
uses: ./.github/workflows/package-build.yml
27+
with:
28+
packagePath: Packages/${{ vars.PACKAGE_NAME }}
29+
unityPackage: ${{ vars.PACKAGE_NAME }}-feature.unitypackage
30+
zipFile: ${{ vars.PACKAGE_NAME }}-feature.zip
31+
website:
32+
needs: package
33+
permissions:
34+
actions: write
35+
contents: read
36+
uses: ./.github/workflows/build-website.yml
37+
with:
38+
listPublishDirectory: Website
39+
pathToCi: ci
40+
zipFile: ${{ vars.PACKAGE_NAME }}-feature.zip
41+
unityPackage: ${{ vars.PACKAGE_NAME }}-feature.unitypackage

0 commit comments

Comments
 (0)