Merge branch 'master' into release/2.0

kendryte · Oct 27, 2023 · e65d9b1 · e65d9b1
2 parents 9f259e1 + 9a7268c
commit e65d9b1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/compiler-build.yml b/.github/workflows/compiler-build.yml
@@ -172,7 +172,7 @@ jobs:
           - {name: x86_64-windows, os: windows-latest, shell: bash}
 
     env:
-      VULKANSDK_VER: 1.2.182.0
+      VULKANSDK_VER: 1.3.268.0
 
     steps:
       - uses: actions/checkout@v3
@@ -211,8 +211,8 @@ jobs:
 
       - name: Set up test environment (Linux)
         run: |
-          wget https://sdk.lunarg.com/sdk/download/${VULKANSDK_VER}/linux/vulkansdk-linux-x86_64-${VULKANSDK_VER}.tar.gz -O vulkansdk.tar.gz
-          tar xf vulkansdk.tar.gz
+          wget https://sdk.lunarg.com/sdk/download/${VULKANSDK_VER}/linux/vulkansdk-linux-x86_64-${VULKANSDK_VER}.tar.xz -O vulkansdk.tar.xz
+          tar xf vulkansdk.tar.xz
           sudo cp -P ${VULKANSDK_VER}/x86_64/lib/libvulkan.so* /usr/local/lib/
           wget https://github.com/sunnycase/swiftshader/releases/download/v1.0/swiftshader-ubuntu-18.04-x86_64.zip -O swiftshader.zip
           unzip swiftshader.zip
@@ -225,8 +225,8 @@ jobs:
       - name: Set up test environment (Windows)
         shell: pwsh
         run: |
-          Invoke-WebRequest -Uri https://sdk.lunarg.com/sdk/download/${env:VULKANSDK_VER}/windows/VulkanSDK-${env:VULKANSDK_VER}-Installer.exe -O VulkanSDK-Installer.exe
-          .\VulkanSDK-Installer.exe /S
+          # Invoke-WebRequest -Uri https://sdk.lunarg.com/sdk/download/${env:VULKANSDK_VER}/windows/VulkanSDK-${env:VULKANSDK_VER}-Installer.exe -O VulkanSDK-Installer.exe
+          # .\VulkanSDK-Installer.exe /S
           Invoke-WebRequest -Uri https://github.com/sunnycase/swiftshader/releases/download/v1.0/swiftshader-windows-2019-x86_64.zip -OutFile swiftshader.zip
           Expand-Archive swiftshader.zip
           Copy-Item swiftshader\lib\vk_swiftshader_icd.json swiftshader\bin\

diff --git a/.github/workflows/compiler-python-release.yml b/.github/workflows/compiler-python-release.yml
@@ -58,7 +58,7 @@ jobs:
           - {name: x86_64-windows, os: windows-latest, arch: x64}
 
     env:
-      VULKANSDK_VER: 1.2.182.0
+      VULKANSDK_VER: 1.3.268.0
 
     steps:
     - uses: actions/checkout@v3

diff --git a/pyproject.toml b/pyproject.toml
@@ -48,9 +48,9 @@ before-all = [
   "pip install conan==1.59",
   "conan profile new default --detect",
   "conan profile update settings.compiler.libcxx=libstdc++11 default",
-  "curl -L https://sdk.lunarg.com/sdk/download/1.2.182.0/linux/vulkansdk-linux-x86_64-1.2.182.0.tar.gz --output vulkansdk.tar.gz",
-  "tar xf vulkansdk.tar.gz",
-  "cp -P 1.2.182.0/x86_64/lib/libvulkan.so* /usr/local/lib/"
+  "curl -L https://sdk.lunarg.com/sdk/download/1.3.268.0/linux/vulkansdk-linux-x86_64-1.3.268.0.tar.xz --output vulkansdk.tar.xz",
+  "tar xf vulkansdk.tar.xz",
+  "cp -P 1.3.268.0/x86_64/lib/libvulkan.so* /usr/local/lib/"
 ]
 before-build = "pip install auditwheel"
 repair-wheel-command = "LD_LIBRARY_PATH=/usr/lib64 auditwheel repair -w {dest_dir} {wheel} --exclude libvulkan.so.1,libgomp.so.1"