diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 8ff5496c5c7c..54f2d511b0d3 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -12,6 +12,7 @@ on: - 'src/layer/riscv/**' - 'src/layer/x86/**' - 'src/layer/vulkan/**' + - 'glslang' pull_request: branches: [master] paths: @@ -24,6 +25,7 @@ on: - 'src/layer/riscv/**' - 'src/layer/x86/**' - 'src/layer/vulkan/**' + - 'glslang' concurrency: group: android-${{ github.ref }} cancel-in-progress: true diff --git a/.github/workflows/compare-binary-size.yml b/.github/workflows/compare-binary-size.yml index 570c29cb27e5..aa12c18cc843 100644 --- a/.github/workflows/compare-binary-size.yml +++ b/.github/workflows/compare-binary-size.yml @@ -8,6 +8,7 @@ on: - 'CMakeLists.txt' - 'cmake/**' - 'src/**' + - 'glslang' concurrency: group: compare-binary-size-${{ github.ref }} diff --git a/.github/workflows/harmonyos.yml b/.github/workflows/harmonyos.yml index d653706e579b..da53fc34613c 100644 --- a/.github/workflows/harmonyos.yml +++ b/.github/workflows/harmonyos.yml @@ -11,6 +11,7 @@ on: - 'src/layer/arm/**' - 'src/layer/x86/**' - 'src/layer/vulkan/**' + - 'glslang' pull_request: branches: [master] paths: @@ -22,6 +23,7 @@ on: - 'src/layer/arm/**' - 'src/layer/x86/**' - 'src/layer/vulkan/**' + - 'glslang' concurrency: group: harmonyos-${{ github.ref }} cancel-in-progress: true diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index fe0364402518..6c0e2eeea0e7 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -12,6 +12,7 @@ on: - 'src/layer/arm/**' - 'src/layer/x86/**' - 'src/layer/vulkan/**' + - 'glslang' pull_request: branches: [master] paths: @@ -24,6 +25,7 @@ on: - 'src/layer/arm/**' - 'src/layer/x86/**' - 'src/layer/vulkan/**' + - 'glslang' concurrency: group: ios-${{ github.ref }} cancel-in-progress: true diff --git a/.github/workflows/linux-x64-gpu-clang.yml b/.github/workflows/linux-x64-gpu-clang.yml index a0599cb41985..d85309174743 100644 --- a/.github/workflows/linux-x64-gpu-clang.yml +++ b/.github/workflows/linux-x64-gpu-clang.yml @@ -14,6 +14,7 @@ on: - 'tools/**' - '!tools/pnnx/**' - 'examples/**' + - 'glslang' pull_request: branches: [master] paths: @@ -28,6 +29,7 @@ on: - 'tools/**' - '!tools/pnnx/**' - 'examples/**' + - 'glslang' concurrency: group: linux-x64-gpu-clang-${{ github.ref }} cancel-in-progress: true diff --git a/.github/workflows/linux-x64-gpu-gcc.yml b/.github/workflows/linux-x64-gpu-gcc.yml index 0b3a17fba201..7a08346c003e 100644 --- a/.github/workflows/linux-x64-gpu-gcc.yml +++ b/.github/workflows/linux-x64-gpu-gcc.yml @@ -14,6 +14,7 @@ on: - 'tools/**' - '!tools/pnnx/**' - 'examples/**' + - 'glslang' pull_request: branches: [master] paths: @@ -28,6 +29,7 @@ on: - 'tools/**' - '!tools/pnnx/**' - 'examples/**' + - 'glslang' concurrency: group: linux-x64-gpu-gcc-${{ github.ref }} cancel-in-progress: true diff --git a/.github/workflows/mac-catalyst.yml b/.github/workflows/mac-catalyst.yml index da5ba43452a7..cc7ed4ef32aa 100644 --- a/.github/workflows/mac-catalyst.yml +++ b/.github/workflows/mac-catalyst.yml @@ -12,6 +12,7 @@ on: - 'src/layer/arm/**' - 'src/layer/x86/**' - 'src/layer/vulkan/**' + - 'glslang' pull_request: branches: [master] paths: @@ -24,6 +25,7 @@ on: - 'src/layer/arm/**' - 'src/layer/x86/**' - 'src/layer/vulkan/**' + - 'glslang' concurrency: group: mac-catalyst-${{ github.ref }} cancel-in-progress: true diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 8558629bb87f..be67c7fadfa5 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -16,6 +16,7 @@ on: - 'tools/**' - '!tools/pnnx/**' - 'examples/**' + - 'glslang' pull_request: branches: [master] paths: @@ -32,6 +33,7 @@ on: - 'tools/**' - '!tools/pnnx/**' - 'examples/**' + - 'glslang' concurrency: group: macos-${{ github.ref }} cancel-in-progress: true diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 5bcdcc5adc63..33e74a9ea3f5 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -11,6 +11,7 @@ on: - 'src/layer/x86/**' - 'src/layer/vulkan/**' - 'python/**' + - 'glslang' pull_request: branches: [master] paths: @@ -22,6 +23,7 @@ on: - 'src/layer/x86/**' - 'src/layer/vulkan/**' - 'python/**' + - 'glslang' concurrency: group: python-${{ github.ref }} cancel-in-progress: true diff --git a/.github/workflows/test-coverage.yml b/.github/workflows/test-coverage.yml index 5206f0f54836..e67f23c0b772 100644 --- a/.github/workflows/test-coverage.yml +++ b/.github/workflows/test-coverage.yml @@ -9,6 +9,7 @@ on: - 'src/**' - 'tests/**' - 'toolchains/**' + - 'glslang' pull_request: branches: [master] paths: @@ -18,6 +19,7 @@ on: - 'src/**' - 'tests/**' - 'toolchains/**' + - 'glslang' concurrency: group: test-coverage-${{ github.ref }} cancel-in-progress: true diff --git a/.github/workflows/tvos.yml b/.github/workflows/tvos.yml index e7b59fe857e4..c2a94bb7ee49 100644 --- a/.github/workflows/tvos.yml +++ b/.github/workflows/tvos.yml @@ -12,6 +12,7 @@ on: - 'src/layer/arm/**' - 'src/layer/x86/**' - 'src/layer/vulkan/**' + - 'glslang' pull_request: branches: [master] paths: @@ -24,6 +25,7 @@ on: - 'src/layer/arm/**' - 'src/layer/x86/**' - 'src/layer/vulkan/**' + - 'glslang' concurrency: group: tvos-${{ github.ref }} cancel-in-progress: true diff --git a/.github/workflows/windows-arm.yml b/.github/workflows/windows-arm.yml index 665100d8497b..b31d5ab58d89 100644 --- a/.github/workflows/windows-arm.yml +++ b/.github/workflows/windows-arm.yml @@ -11,6 +11,7 @@ on: - 'src/layer/arm/**' - 'src/layer/vulkan/**' - 'tests/**' + - 'glslang' pull_request: branches: [master] paths: @@ -22,6 +23,7 @@ on: - 'src/layer/arm/**' - 'src/layer/vulkan/**' - 'tests/**' + - 'glslang' concurrency: group: windows-arm-${{ github.ref }} cancel-in-progress: true diff --git a/.github/workflows/windows-clang.yml b/.github/workflows/windows-clang.yml index 080a0e4ebf06..ec38e93318f2 100644 --- a/.github/workflows/windows-clang.yml +++ b/.github/workflows/windows-clang.yml @@ -12,6 +12,7 @@ on: - 'src/layer/x86/**' - 'src/layer/vulkan/**' - 'tests/**' + - 'glslang' pull_request: branches: [master] paths: @@ -24,6 +25,7 @@ on: - 'src/layer/x86/**' - 'src/layer/vulkan/**' - 'tests/**' + - 'glslang' concurrency: group: windows-clang-${{ github.ref }} cancel-in-progress: true diff --git a/.github/workflows/windows-mingw.yml b/.github/workflows/windows-mingw.yml index fbc5fab461de..ef09d3502d16 100644 --- a/.github/workflows/windows-mingw.yml +++ b/.github/workflows/windows-mingw.yml @@ -11,6 +11,7 @@ on: - 'src/layer/x86/**' - 'src/layer/vulkan/**' - 'tests/**' + - 'glslang' pull_request: branches: [master] paths: @@ -22,6 +23,7 @@ on: - 'src/layer/x86/**' - 'src/layer/vulkan/**' - 'tests/**' + - 'glslang' concurrency: group: windows-mingw-${{ github.ref }} cancel-in-progress: true diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 0d95448683b9..94c2765a1f36 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -14,6 +14,7 @@ on: - 'tools/**' - '!tools/pnnx/**' - 'examples/**' + - 'glslang' pull_request: branches: [master] paths: @@ -28,6 +29,7 @@ on: - 'tools/**' - '!tools/pnnx/**' - 'examples/**' + - 'glslang' concurrency: group: windows-${{ github.ref }} cancel-in-progress: true diff --git a/glslang b/glslang index 8cd77a808d0b..fe88f421038e 160000 --- a/glslang +++ b/glslang @@ -1 +1 @@ -Subproject commit 8cd77a808d0bffa442ae9462d5e3a8141892ba5a +Subproject commit fe88f421038e1bb0a25cd5c1b2dfe505db82d08f