Skip to content

Commit

Permalink
Merge pull request #9 from kurone-kito/maintenance
Browse files Browse the repository at this point in the history
Cumulative update, including fixes for issues where CI/CD fails due to .NET version incompatibility
  • Loading branch information
kurone-kito authored Oct 17, 2024
2 parents 8898a2f + 93b34eb commit 3642703
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 6 deletions.
10 changes: 6 additions & 4 deletions .github/workflows/build-listing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,19 @@ jobs:
uses: actions/checkout@v4
with:
repository: vrchat-community/package-list-action
path: ${{env.pathToCi}}
path: ${{ env.pathToCi }}
clean: false # otherwise the local repo will no longer be checked out
- name: Deploy the global.json file
run: cp "${{ github.workspace }}/global.json" "${{ env.pathToCi }}/"
- name: Restore Cache
uses: actions/cache@v4
with:
path: |
${{env.pathToCi}}/.nuke/temp
${{ env.pathToCi }}/.nuke/temp
~/.nuget/packages
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
- name: Build Package Version Listing
run: ${{env.pathToCi}}/build.cmd BuildMultiPackageListing --root ${{env.pathToCi}} --list-publish-directory $GITHUB_WORKSPACE/${{env.listPublishDirectory}}
run: '"${{ env.pathToCi }}/build.cmd" BuildMultiPackageListing --root "${{ env.pathToCi }}" --list-publish-directory "$GITHUB_WORKSPACE/${{ env.listPublishDirectory }}"'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Setup Pages
Expand All @@ -57,7 +59,7 @@ jobs:
- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
path: ${{env.listPublishDirectory}}
path: ${{ env.listPublishDirectory }}
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
37 changes: 37 additions & 0 deletions .github/workflows/build-on-push.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Build on push to feature branch for testing
on:
push:
branches:
- '*'
- '!main'
permissions:
contents: read
env:
listPublishDirectory: Website
pathToCi: ci
jobs:
build:
name: Build the page
runs-on: ubuntu-latest
steps:
- name: Check out the repository
uses: actions/checkout@v4
- name: Check out the automation repository
uses: actions/checkout@v4
with:
repository: vrchat-community/package-list-action
path: ${{ env.pathToCi }}
clean: false # otherwise the local repo will no longer be checked out
- name: Deploy the global.json file
run: cp "${{ github.workspace }}/global.json" "${{ env.pathToCi }}/"
- name: Restore Cache
uses: actions/cache@v4
with:
path: |
${{ env.pathToCi }}/.nuke/temp
~/.nuget/packages
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
- name: Build Package Version Listing
run: '"${{ env.pathToCi }}/build.cmd" BuildMultiPackageListing --root "${{ env.pathToCi }}" --list-publish-directory "$GITHUB_WORKSPACE/${{ env.listPublishDirectory }}"'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dotnet 8.0.403
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"explorer.fileNesting.patterns": {
"*.md": "${capture}.*.md",
".gitattributes": ".gitignore",
".markdownlint.*": ".markdownlint-cli2.*"
".markdownlint.*": ".markdownlint-cli2.*",
".tool-versions": "global.json"
},
"files.associations": {
".imgbotconfig": "json",
Expand Down
2 changes: 1 addition & 1 deletion cspell.config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ enableGlobDot: true
features:
weighted-suggestions: true
globRoot: ${cwd}
language: en,ja
ignorePaths:
- .*ignore
- .git
- .github/CODE_OF_CONDUCT.*
- .vscode/extensions.json
- cspell.config.yml
language: en,ja
useGitignore: true
version: '0.2'
words:
Expand Down
6 changes: 6 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"sdk": {
"rollForward": "latestMinor",
"version": "8.0.403"
}
}

0 comments on commit 3642703

Please sign in to comment.