Skip to content

[ci] Do not setup Vulkan SDK #8692

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

Merged
feisuzhu merged 4 commits into from
Apr 29, 2025
Merged

[ci] Do not setup Vulkan SDK #8692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
693e465
[ci] Do not setup Vulkan SDK
feisuzhu Apr 27, 2025
1fdcfbb
Update entry.py
bobcao3 Apr 28, 2025
45ecbac
Update entry.py
bobcao3 Apr 28, 2025
eca3e28
fix fmt
bobcao3 Apr 28, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/scripts/common-utils.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
function UnsetGitCachingProxy {
Write-Host "Unsetting git caching proxy"
git config --global --unset https.proxy
git config --global --unset https.proxy || true
# git config --global --list | Select-String 'url\.' | ForEach-Object {
# $key = $_ -split '=' | Select-Object -First 1
# git config --global --unset-all $key
Expand All @@ -11,7 +11,7 @@ function SetGitCachingProxy {
Write-Host "Setting up git caching proxy"
# git config --global --add "url.http://oauth2:${env:GITHUB_TOKEN}@git-cdn-github.botmaster.tgr/.insteadOf" https://github.com/
# git config --global --add "url.http://oauth2:${env:GITHUB_TOKEN}@git-cdn-github.botmaster.tgr/.insteadOf" git@github.com:
git config --global https.proxy http://proxy.tgr:18000
git config --global https.proxy http://proxy.tgr:18000 || true
}

if($env:TI_USE_GIT_CACHE) {
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scripts/common-utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function set-git-caching-proxy {
echo "Setting git caching proxy"
# git config --global --add url.http://oauth2:$GITHUB_TOKEN@git-cdn-github.botmaster.tgr/.insteadOf https://github.com/
# git config --global --add url.http://oauth2:$GITHUB_TOKEN@git-cdn-github.botmaster.tgr/.insteadOf git@github.com:
git config --global https.proxy http://proxy.tgr:18000 || true
git config --global https.proxy http://proxy.tgr:18000 || true
}

if [ ! -z "$TI_USE_GIT_CACHE" ]; then
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/scripts/ti_build/entry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
from .python import get_desired_python_version, setup_python
from .sccache import setup_sccache
from .tinysh import Command, CommandFailed, git, nice
from .vulkan import setup_vulkan

# from .vulkan import setup_vulkan


# -- code --
Expand Down Expand Up @@ -81,7 +82,12 @@ def setup_basic_build_env():
setup_clang()

setup_llvm()
setup_vulkan()
if u.system == "Linux":
# We support & test Vulkan shader debug printf on Linux
# This is done through the validation layer
from .vulkan import setup_vulkan

setup_vulkan()

sccache = setup_sccache()

Expand Down
Loading