Skip to content

Commit

Permalink
Merge branch 'master' into 764-make-helpsystem-work-again-and-provide…
Browse files Browse the repository at this point in the history
…-additional-content
  • Loading branch information
SarahAugustinowski committed Sep 23, 2024
2 parents fa6587d + 383b97d commit db0b11a
Show file tree
Hide file tree
Showing 11,344 changed files with 5,091 additions and 125,707 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
27 changes: 12 additions & 15 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ on:
workflow_dispatch:
inputs:
windows:
description: 'Create Windows build?'
description: "Create Windows build?"
default: true
type: boolean
linux:
description: 'Create Linux build?'
description: "Create Linux build?"
default: true
type: boolean

Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
fi
fi
echo "PATTERNS=none" >> $GITHUB_ENV
- uses: actions/github-script@v6
- uses: actions/github-script@v7
name: Check for bad patterns
with:
retries: 3
Expand Down Expand Up @@ -147,7 +147,7 @@ jobs:
Library-SEE
- name: Restore NuGet packages
run: /home/see/.dotnet/tools/nugetforunity restore .
- uses: game-ci/unity-test-runner@v4.1.1
- uses: game-ci/unity-test-runner@v4
timeout-minutes: 60
name: Run Tests
id: tests
Expand All @@ -158,10 +158,10 @@ jobs:
with:
githubToken: ${{ secrets.GITHUB_TOKEN }}
checkName: Test Results
testMode: EditMode # PlayMode tests get stuck in batchmode
testMode: EditMode # PlayMode tests get stuck in batchmode
runAsHostUser: true
customParameters: -testCategory "!NonDeterministic"
coverageOptions: 'generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+SEE'
coverageOptions: "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+SEE"
- uses: actions/upload-artifact@v4
continue-on-error: true
name: Upload test results
Expand Down Expand Up @@ -203,7 +203,6 @@ jobs:
echo "targetPlatforms=$(jq --compact-output --null-input '$ARGS.positional' --args -- ${targetPlatforms[@]})" >> $GITHUB_OUTPUT
fi
build:
name: Create build
runs-on: ${{ needs.setup.outputs.runner }}
Expand Down Expand Up @@ -248,7 +247,7 @@ jobs:
with:
name: SEE-${{ matrix.targetPlatform }}-${{ github.sha }}.zip
path: build-${{ matrix.targetPlatform }}.zip
retention-days: 7 # Due to high space usage.
retention-days: 7 # Due to high space usage.

release:
name: Release
Expand All @@ -266,7 +265,7 @@ jobs:
tag: pr-${{ github.event.pull_request.number }}
message: ${{ github.event.pull_request.title }}
- name: Publish release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
prerelease: true
name: ${{ github.event.pull_request.title }}
Expand All @@ -277,20 +276,19 @@ jobs:
body: |
This release incorporates the changes by @${{ github.event.pull_request.user.login }} from pull request #${{ github.event.pull_request.number }}.
Builds for Windows and Linux are available below.
## Details
${{ github.event.pull_request.body }}
---
> [See original pull request for details.](${{ github.event.pull_request.html_url }})
> [See original pull request for details.](${{ github.event.pull_request.html_url }})
cleanup:
name: Cleanup
runs-on: ${{ needs.setup.outputs.runner }}
if: ${{ always() }}
needs: [setup, test, build, release] # "test", "build" and "release" use docker and sometimes mess up permissions.
needs: [setup, test, build, release] # "test", "build" and "release" use docker and sometimes mess up permissions.
strategy:
fail-fast: false
steps:
Expand All @@ -302,4 +300,3 @@ jobs:
if: always()
shell: bash
run: sudo /mnt/scripts/set-work-permissions.sh

4 changes: 2 additions & 2 deletions Assets/Plugins/AmplifyShaderEditor/ChangeLog.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Assets/Plugins/Animations/AssistantIdle.anim
Git LFS file not shown
3 changes: 3 additions & 0 deletions Assets/Plugins/Animations/AssistantIdle.anim.meta
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/Plugins/Animations/AvatarAimingSystem.controller
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/Plugins/Animations/AvatarIdle.anim
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/Plugins/Animations/PersonalAssistant.controller
Git LFS file not shown
3 changes: 3 additions & 0 deletions Assets/Plugins/Animations/PlayerIdle.anim
Git LFS file not shown
3 changes: 3 additions & 0 deletions Assets/Plugins/Animations/PlayerIdle.anim.meta
Git LFS file not shown

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions Assets/Plugins/Crazy Minnow Studio/Addons/OneClickUMA.meta

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/Plugins/Dissonance/Demo/Body.prefab

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/Plugins/Dissonance/Demo/DemoWorld.prefab

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/Plugins/Dissonance/Demo/GroundMaterial.mat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/Plugins/Dissonance/Demo/PlayerMaterial.mat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/Plugins/Dissonance/Demo/Resources/ChatBox.prefab

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/Plugins/Dissonance/Demo/Resources/TriggerMaterial.mat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/Plugins/Dissonance/Demo/Visor.prefab

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/Plugins/Dissonance/Demo/VisorMaterial.mat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/Plugins/Dissonance/Resources/PlaybackPrefab.prefab

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/Plugins/FinalIK_UMA2/FinalIK_UMA2.asmdef

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit db0b11a

Please sign in to comment.