Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/update-release-tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
fetch-depth: 0
- uses: RageAgainstThePixel/update-action-release-tags@v1
33 changes: 15 additions & 18 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
name: validate
on:
push:
branches:
- 'main'
branches: ['main']
pull_request:
branches:
- '**'
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
branches: ['**']
workflow_dispatch: # Allows you to run this workflow manually from the Actions tab
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
Expand Down Expand Up @@ -40,32 +37,32 @@
unity-version: 6000.x
build-target: StandaloneOSX
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- uses: actions/checkout@v5
with:
repository: RageAgainstThePixel/com.utilities.async
path: com.utilities.async
- uses: buildalon/unity-setup@v1
- uses: buildalon/unity-setup@main
with:
unity-version: ${{ matrix.unity-version }}
build-targets: ${{ matrix.build-target }}
version-file: ${{ github.workspace }}/com.utilities.async/Utilities.Async/ProjectSettings/ProjectVersion.txt
- uses: buildalon/activate-unity-license@v1
- uses: buildalon/activate-unity-license@main
with:
license: 'Personal'
username: ${{ secrets.UNITY_USERNAME }}
password: ${{ secrets.UNITY_PASSWORD }}
- uses: buildalon/unity-action@v1
name: '${{ matrix.build-target }}-Validate'
- uses: buildalon/unity-action@main
name: ${{ matrix.build-target }}-Validate
with:
log-name: '${{ matrix.build-target }}-Validate'
args: '-quit -nographics -batchmode -executeMethod Utilities.Editor.BuildPipeline.UnityPlayerBuildTools.ValidateProject -importTMProEssentialsAsset'
- uses: buildalon/unity-action@v1
name: '${{ matrix.build-target }}-Test'
log-name: ${{ matrix.build-target }}-Validate
args: -quit -nographics -batchmode -executeMethod Utilities.Editor.BuildPipeline.UnityPlayerBuildTools.ValidateProject -importTMProEssentialsAsset
- uses: buildalon/unity-action@main
name: ${{ matrix.build-target }}-Test
with:
log-name: '${{ matrix.build-target }}-Test'
log-name: ${{ matrix.build-target }}-Test
build-target: ${{ matrix.build-target }}
args: '-nographics -batchmode -runTests -testPlatform EditMode -testResults "${{ github.workspace }}/Logs/${{ matrix.build-target }}-results.xml"'
args: -nographics -batchmode -runTests -testPlatform EditMode -testResults "${{ github.workspace }}/Logs/${{ matrix.build-target }}-results.xml"
- uses: actions/upload-artifact@v4
if: success() || failure()
with:
Expand Down
8 changes: 4 additions & 4 deletions action.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: Buildalon unity-test-summary
description: 'A GitHub action to gather and display Unit Tests from the Unity Game Engine.'
branding:
icon: 'list'
color: 'red'
icon: list
color: red
inputs:
test-results:
description: 'The path to the test results file(s).'
required: true
runs:
using: 'node20'
main: 'dist/index.js'
using: node20
main: dist/index.js
2 changes: 1 addition & 1 deletion dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4612,7 +4612,7 @@ function expand(str, isTop) {
var isOptions = m.body.indexOf(',') >= 0;
if (!isSequence && !isOptions) {
// {a},b}
if (m.post.match(/,.*\}/)) {
if (m.post.match(/,(?!,).*\}/)) {
str = m.pre + '{' + m.body + escClose + m.post;
return expand(str);
}
Expand Down
2 changes: 1 addition & 1 deletion dist/index.js.map

Large diffs are not rendered by default.

Loading