From 2150d60baaeee22cb07f48880c5d74f1cd96def7 Mon Sep 17 00:00:00 2001 From: bd_ Date: Sun, 7 Jan 2024 17:25:23 +0900 Subject: [PATCH] chore(ci): fix another yarn install --immutable issue (#616) --- .github/workflows/test-docs-site-build.yml | 9 +++++---- Samples/Fingerpen/FingerpenMaterial.mat | 12 +++++++++--- docs-site~/.yarnrc.yml | 1 + 3 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 docs-site~/.yarnrc.yml diff --git a/.github/workflows/test-docs-site-build.yml b/.github/workflows/test-docs-site-build.yml index 4cd45659..487480d3 100644 --- a/.github/workflows/test-docs-site-build.yml +++ b/.github/workflows/test-docs-site-build.yml @@ -20,10 +20,11 @@ jobs: run: | corepack enable corepack prepare yarn@stable --activate + yarn --version - - name: Get yarn cache directory path - id: yarn-cache-dir-path - run: echo "dir=$(cd docs-site~; yarn config get cacheFolder)" >> $GITHUB_OUTPUT + #- name: Get yarn cache directory path + # id: yarn-cache-dir-path + # run: echo "dir=$(cd docs-site~; yarn config get cacheFolder)" >> $GITHUB_OUTPUT - uses: actions/cache@v3 if: false @@ -37,7 +38,7 @@ jobs: - name: Build CF site run: | cd docs-site~ - yarn install --immutable --check-cache + YARN_ENABLE_HARDENED_MODE=0 YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install - name: Display diff on failure if: ${{ failure() }} diff --git a/Samples/Fingerpen/FingerpenMaterial.mat b/Samples/Fingerpen/FingerpenMaterial.mat index 24a85679..6e56ee55 100644 --- a/Samples/Fingerpen/FingerpenMaterial.mat +++ b/Samples/Fingerpen/FingerpenMaterial.mat @@ -2,21 +2,25 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: FingerpenMaterial m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: - - ALWAYS + - GRABPASS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -56,6 +60,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendOp: 0 - _BumpScale: 1 @@ -95,3 +100,4 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/docs-site~/.yarnrc.yml b/docs-site~/.yarnrc.yml new file mode 100644 index 00000000..17c2c6f3 --- /dev/null +++ b/docs-site~/.yarnrc.yml @@ -0,0 +1 @@ +checksumBehavior: ignore \ No newline at end of file