Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Devel #3240

Merged
merged 4 commits into from
Oct 9, 2024
+189 −188
Merged

Devel #3240

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb5283d
Plugins: RsImage - expose *.hdr support
paroj Oct 7, 2024
62969e5
Plugins: STBI - update stb_image
paroj Oct 9, 2024
78cf863
Main: ScriptCompiler - pass on variables as names
paroj Oct 9, 2024
137481f
CI: update VulkanSDK
paroj Oct 9, 2024
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
Prev Previous commit
CI: update VulkanSDK 
old one no longer available, new matches Ubuntu 24.04
@paroj
paroj committed Oct 9, 2024
commit 137481f2c1600592a96c7c1e2895ad238575b7fd
6 changes: 3 additions & 3 deletions .github/workflows/pip-build.yml
View file
Original file line number Diff line number Diff line change
@@ -41,16 +41,16 @@ jobs:
shell: bash
- name: Install Dependencies
run: |
curl -LO https://sdk.lunarg.com/sdk/download/1.3.224.1/windows/VulkanSDK-1.3.224.1-Installer.exe
.\VulkanSDK-1.3.224.1-Installer.exe --accept-licenses --default-answer --confirm-command install
curl -LO https://sdk.lunarg.com/sdk/download/1.3.275.0/windows/VulkanSDK-1.3.275.0-Installer.exe
.\VulkanSDK-1.3.275.0-Installer.exe --accept-licenses --default-answer --confirm-command install
- name: Build
run: |
python -m pip install --upgrade pip==24.0
pip install setuptools wheel twine
pip wheel . --verbose
python -m twine upload --repository pypi *.whl
env:
VULKAN_SDK: C:\VulkanSDK\1.3.224.1
VULKAN_SDK: C:\VulkanSDK\1.3.275.0
SKBUILD_BUILD_OPTIONS: -j4
macos:
runs-on: macos-12
4 changes: 2 additions & 2 deletions SDK/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM quay.io/pypa/manylinux_2_28_x86_64:latest
RUN yum install -y libXrandr-devel mesa-libEGL-devel vulkan-devel
WORKDIR /
RUN curl -LO https://sdk.lunarg.com/sdk/download/1.3.224.1/linux/vulkansdk-linux-x86_64-1.3.224.1.tar.gz && tar xvf vulkansdk-linux-x86_64-1.3.224.1.tar.gz
ENV VULKAN_SDK=/1.3.224.1/x86_64/
RUN curl -LO https://sdk.lunarg.com/sdk/download/1.3.275.0/linux/vulkansdk-linux-x86_64-1.3.275.0.tar.gz && tar xvf vulkansdk-linux-x86_64-1.3.275.0.tar.gz
ENV VULKAN_SDK=/1.3.275.0/x86_64/
WORKDIR /workspace
CMD PATH="/opt/python/$PYVER/bin/:$PATH" pip wheel . --verbose
6 changes: 3 additions & 3 deletions appveyor.yml
View file
Original file line number Diff line number Diff line change
@@ -10,13 +10,13 @@ install:
- cmd: pip install swig
- cmd: curl -sSf -o rustup-init.exe https://win.rustup.rs/
- cmd: rustup-init.exe -y
- cmd: curl -LO https://sdk.lunarg.com/sdk/download/1.3.224.1/windows/VulkanSDK-1.3.224.1-Installer.exe
- cmd: VulkanSDK-1.3.224.1-Installer.exe --accept-licenses --default-answer --confirm-command install
- cmd: curl -LO https://sdk.lunarg.com/sdk/download/1.3.275.0/windows/VulkanSDK-1.3.275.0-Installer.exe
- cmd: VulkanSDK-1.3.275.0-Installer.exe --accept-licenses --default-answer --confirm-command install
- cmd: cd %APPVEYOR_BUILD_FOLDER%
- cmd: git submodule update --init --recursive
build_script:
- set PATH=C:\Qt\6.2\msvc2019_64\bin;C:\Users\appveyor\.cargo\bin;%PATH%
- set VULKAN_SDK=C:\VulkanSDK\1.3.224.1
- set VULKAN_SDK=C:\VulkanSDK\1.3.275.0
- cmake -P ci-build.cmake
- cmake --build build --config RelWithDebInfo --target INSTALL
test_script: