update unity, use text decal from git, add gitea workflow

This commit is contained in:
Kirill Chikalin
2025-03-04 08:55:00 +03:00
parent aae9f69b2c
commit fb883a7222
9 changed files with 107 additions and 32 deletions

View File

@@ -0,0 +1,65 @@
name: build
on:
- push
- pull_request
jobs:
checklicense:
name: Check for UNITY_LICENSE in GitHub Secrets
runs-on: ubuntu-latest
outputs:
is_unity_license_set: ${{ steps.checklicense_job.outputs.is_unity_license_set }}
steps:
- name: Check whether unity activation requests should be done
id: checklicense_job
env:
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
run: |
echo "Skip activation job: ${{ env.UNITY_LICENSE != '' }}"
export is_unity_license_set="${{ env.UNITY_LICENSE != '' }}"
echo "is_unity_license_set=$is_unity_license_set" >> $GITHUB_OUTPUT
build:
name: Build for ${{ matrix.targetPlatform }}
needs: checklicense
runs-on:
- ubuntu-latest
container:
volumes:
- /volume1/docker/gitea_actions/act:/volume1/docker/gitea_actions/act
- /volume1/docker/gitea_actions/workspace:/volume1/docker/gitea_actions/workspace
strategy:
fail-fast: false
matrix:
targetPlatform:
# - Android
- WebGL
steps:
- uses: actions/checkout@v4.2.2
with:
lfs: true
- uses: actions/cache@v4.2.2
with:
path: Library
key: Library-${{ matrix.targetPlatform }}
- uses: https://git.chikalin.space/unity/unity-builder@742a850b88e70342487c06e2f5b57675184b9503
options: --volumes-from=${{ env.JOB_CONTAINER_NAME }}
env:
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
# JOB_CONTAINER_NAME: ${{ env.JOB_CONTAINER_NAME }}
ACTION_FOLDER: /volume1/docker/gitea_actions/act/89fa79d6bd3aaa9f7d3b54bdd5ab294be883964442f1a7519922be8d66f94342/dist
with:
targetPlatform: ${{ matrix.targetPlatform }}
dockerCpuLimit: 0
RUNNER_TEMP: /volume1/docker/gitea_actions/act/temp
buildProfile: Assets/Settings/Build Profiles/Android Release.asset
dockerWorkspacePath: /volume1/docker/gitea_actions/workspace/unity/textdecalURP
- uses: actions/upload-artifact@v3
with:
name: Build-${{ matrix.targetPlatform }}
path: build

View File

@@ -2,6 +2,5 @@
<project version="4"> <project version="4">
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" /> <mapping directory="" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../space.chikalin.textdecal" vcs="Git" />
</component> </component>
</project> </project>

View File

@@ -99,25 +99,25 @@ MonoBehaviour:
obsoleteHasProbeVolumes: obsoleteHasProbeVolumes:
m_Keys: [] m_Keys: []
m_Values: m_Values:
m_PrefilteringModeMainLightShadows: 0 m_PrefilteringModeMainLightShadows: 3
m_PrefilteringModeAdditionalLight: 0 m_PrefilteringModeAdditionalLight: 0
m_PrefilteringModeAdditionalLightShadows: 0 m_PrefilteringModeAdditionalLightShadows: 0
m_PrefilterXRKeywords: 1 m_PrefilterXRKeywords: 1
m_PrefilteringModeForwardPlus: 2 m_PrefilteringModeForwardPlus: 2
m_PrefilteringModeDeferredRendering: 0 m_PrefilteringModeDeferredRendering: 0
m_PrefilteringModeScreenSpaceOcclusion: 2 m_PrefilteringModeScreenSpaceOcclusion: 0
m_PrefilterDebugKeywords: 1 m_PrefilterDebugKeywords: 1
m_PrefilterWriteRenderingLayers: 1 m_PrefilterWriteRenderingLayers: 1
m_PrefilterHDROutput: 1 m_PrefilterHDROutput: 1
m_PrefilterAlphaOutput: 1 m_PrefilterAlphaOutput: 1
m_PrefilterSSAODepthNormals: 0 m_PrefilterSSAODepthNormals: 1
m_PrefilterSSAOSourceDepthLow: 1 m_PrefilterSSAOSourceDepthLow: 1
m_PrefilterSSAOSourceDepthMedium: 1 m_PrefilterSSAOSourceDepthMedium: 1
m_PrefilterSSAOSourceDepthHigh: 1 m_PrefilterSSAOSourceDepthHigh: 1
m_PrefilterSSAOInterleaved: 1 m_PrefilterSSAOInterleaved: 1
m_PrefilterSSAOBlueNoise: 0 m_PrefilterSSAOBlueNoise: 1
m_PrefilterSSAOSampleCountLow: 1 m_PrefilterSSAOSampleCountLow: 1
m_PrefilterSSAOSampleCountMedium: 0 m_PrefilterSSAOSampleCountMedium: 1
m_PrefilterSSAOSampleCountHigh: 1 m_PrefilterSSAOSampleCountHigh: 1
m_PrefilterDBufferMRT1: 1 m_PrefilterDBufferMRT1: 1
m_PrefilterDBufferMRT2: 1 m_PrefilterDBufferMRT2: 1

View File

@@ -105,23 +105,23 @@ MonoBehaviour:
m_PrefilterXRKeywords: 1 m_PrefilterXRKeywords: 1
m_PrefilteringModeForwardPlus: 2 m_PrefilteringModeForwardPlus: 2
m_PrefilteringModeDeferredRendering: 0 m_PrefilteringModeDeferredRendering: 0
m_PrefilteringModeScreenSpaceOcclusion: 2 m_PrefilteringModeScreenSpaceOcclusion: 0
m_PrefilterDebugKeywords: 1 m_PrefilterDebugKeywords: 1
m_PrefilterWriteRenderingLayers: 1 m_PrefilterWriteRenderingLayers: 1
m_PrefilterHDROutput: 1 m_PrefilterHDROutput: 1
m_PrefilterAlphaOutput: 1 m_PrefilterAlphaOutput: 1
m_PrefilterSSAODepthNormals: 0 m_PrefilterSSAODepthNormals: 1
m_PrefilterSSAOSourceDepthLow: 1 m_PrefilterSSAOSourceDepthLow: 1
m_PrefilterSSAOSourceDepthMedium: 1 m_PrefilterSSAOSourceDepthMedium: 1
m_PrefilterSSAOSourceDepthHigh: 1 m_PrefilterSSAOSourceDepthHigh: 1
m_PrefilterSSAOInterleaved: 1 m_PrefilterSSAOInterleaved: 1
m_PrefilterSSAOBlueNoise: 0 m_PrefilterSSAOBlueNoise: 1
m_PrefilterSSAOSampleCountLow: 1 m_PrefilterSSAOSampleCountLow: 1
m_PrefilterSSAOSampleCountMedium: 0 m_PrefilterSSAOSampleCountMedium: 1
m_PrefilterSSAOSampleCountHigh: 1 m_PrefilterSSAOSampleCountHigh: 1
m_PrefilterDBufferMRT1: 1 m_PrefilterDBufferMRT1: 1
m_PrefilterDBufferMRT2: 1 m_PrefilterDBufferMRT2: 1
m_PrefilterDBufferMRT3: 1 m_PrefilterDBufferMRT3: 0
m_PrefilterSoftShadowsQualityLow: 1 m_PrefilterSoftShadowsQualityLow: 1
m_PrefilterSoftShadowsQualityMedium: 1 m_PrefilterSoftShadowsQualityMedium: 1
m_PrefilterSoftShadowsQualityHigh: 1 m_PrefilterSoftShadowsQualityHigh: 1

View File

@@ -56,7 +56,17 @@ MonoBehaviour:
- rid: 1984086672035282944 - rid: 1984086672035282944
- rid: 6632731399656833024 - rid: 6632731399656833024
m_RuntimeSettings: m_RuntimeSettings:
m_List: [] m_List:
- rid: 6852985685364965378
- rid: 6852985685364965379
- rid: 6852985685364965380
- rid: 6852985685364965381
- rid: 6852985685364965384
- rid: 6852985685364965385
- rid: 6852985685364965392
- rid: 6852985685364965394
- rid: 8712630790384254976
- rid: 1984086672035282944
m_AssetVersion: 8 m_AssetVersion: 8
m_ObsoleteDefaultVolumeProfile: {fileID: 0} m_ObsoleteDefaultVolumeProfile: {fileID: 0}
m_RenderingLayerNames: m_RenderingLayerNames:

View File

@@ -1,15 +1,15 @@
{ {
"dependencies": { "dependencies": {
"com.unity.collab-proxy": "2.6.0", "com.unity.collab-proxy": "2.7.1",
"com.unity.entities": "1.3.8", "com.unity.entities": "1.3.8",
"com.unity.ide.rider": "3.0.34", "com.unity.ide.rider": "3.0.34",
"com.unity.inputsystem": "1.13.0", "com.unity.inputsystem": "1.13.0",
"com.unity.recorder": "5.1.2", "com.unity.recorder": "5.1.2",
"com.unity.render-pipelines.universal": "17.0.3", "com.unity.render-pipelines.universal": "17.0.4",
"com.unity.splines": "2.7.2", "com.unity.splines": "2.7.2",
"com.unity.test-framework": "1.4.6", "com.unity.test-framework": "1.4.6",
"com.unity.ugui": "2.0.0", "com.unity.ugui": "2.0.0",
"space.chikalin.textdecal": "file:/Users/kirill/unity/textdecal/space.chikalin.textdecal", "space.chikalin.textdecal": "https://git.chikalin.space/unity/space.chikalin.textdecal.git",
"com.unity.modules.accessibility": "1.0.0", "com.unity.modules.accessibility": "1.0.0",
"com.unity.modules.ai": "1.0.0", "com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0", "com.unity.modules.androidjni": "1.0.0",

View File

@@ -28,7 +28,7 @@
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.collab-proxy": { "com.unity.collab-proxy": {
"version": "2.6.0", "version": "2.7.1",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
@@ -133,7 +133,7 @@
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.render-pipelines.core": { "com.unity.render-pipelines.core": {
"version": "17.0.3", "version": "17.0.4",
"depth": 1, "depth": 1,
"source": "builtin", "source": "builtin",
"dependencies": { "dependencies": {
@@ -148,12 +148,12 @@
} }
}, },
"com.unity.render-pipelines.universal": { "com.unity.render-pipelines.universal": {
"version": "17.0.3", "version": "17.0.4",
"depth": 0, "depth": 0,
"source": "builtin", "source": "builtin",
"dependencies": { "dependencies": {
"com.unity.render-pipelines.core": "17.0.3", "com.unity.render-pipelines.core": "17.0.4",
"com.unity.shadergraph": "17.0.3", "com.unity.shadergraph": "17.0.4",
"com.unity.render-pipelines.universal-config": "17.0.3" "com.unity.render-pipelines.universal-config": "17.0.3"
} }
}, },
@@ -183,7 +183,7 @@
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.searcher": { "com.unity.searcher": {
"version": "4.9.2", "version": "4.9.3",
"depth": 2, "depth": 2,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
@@ -207,12 +207,12 @@
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.shadergraph": { "com.unity.shadergraph": {
"version": "17.0.3", "version": "17.0.4",
"depth": 1, "depth": 1,
"source": "builtin", "source": "builtin",
"dependencies": { "dependencies": {
"com.unity.render-pipelines.core": "17.0.3", "com.unity.render-pipelines.core": "17.0.4",
"com.unity.searcher": "4.9.2" "com.unity.searcher": "4.9.3"
} }
}, },
"com.unity.splines": { "com.unity.splines": {
@@ -268,12 +268,13 @@
} }
}, },
"space.chikalin.textdecal": { "space.chikalin.textdecal": {
"version": "file:/Users/kirill/unity/textdecal/space.chikalin.textdecal", "version": "https://git.chikalin.space/unity/space.chikalin.textdecal.git",
"depth": 0, "depth": 0,
"source": "local", "source": "git",
"dependencies": { "dependencies": {
"com.unity.ugui": "2.0.0" "com.unity.ugui": "2.0.0"
} },
"hash": "b3b5d168e3b6440b28e630c45eb56638152b64a9"
}, },
"com.unity.modules.accessibility": { "com.unity.modules.accessibility": {
"version": "1.0.0", "version": "1.0.0",

View File

@@ -5,10 +5,10 @@ EditorBuildSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Scenes: m_Scenes:
- enabled: 0
path: Assets/Samples/SampleURP/Scenes/SampleURP.unity
guid: 99c9720ab356a0642a771bea13969a05
- enabled: 1 - enabled: 1
path: Assets/Samples/SampleURP/Scenes/SampleURP.unity
guid: 1c7d5ccf5af491043b2ca4886a7be7d6
- enabled: 0
path: Assets/Samples/SampleCurvedText/Scenes/SampleCurvedText.unity path: Assets/Samples/SampleCurvedText/Scenes/SampleCurvedText.unity
guid: 0adb9b80cf6834576a2888675f312acc guid: 0adb9b80cf6834576a2888675f312acc
m_configObjects: m_configObjects:

View File

@@ -1,2 +1,2 @@
m_EditorVersion: 6000.0.38f1 m_EditorVersion: 6000.0.40f1
m_EditorVersionWithRevision: 6000.0.38f1 (82314a941f2d) m_EditorVersionWithRevision: 6000.0.40f1 (157d81624ddf)