Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions .github/workflows/linux_arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,6 @@ jobs:
bash nodesource_setup.sh
sudo apt-get install -y nodejs

rustup default stable

pip3 install --use-pep517 python-dotenv jinja2

df -h .
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/linux_ubuntu2204.yml
Original file line number Diff line number Diff line change
Expand Up @@ -179,12 +179,7 @@ jobs:
# library is instrumented with AddressSanitizer.
rustup update stable
if [ "${{ matrix.build_type }}" = "debug" ]; then
echo "Setting Rust toolchain to stable with the GNU ASAN target"
rustup default stable
rustup target add --toolchain stable x86_64-unknown-linux-gnuasan
else
echo "Setting Rust toolchain to stable for Linux release build"
rustup default stable
fi

rustc --version
Expand Down
12 changes: 0 additions & 12 deletions .github/workflows/mac_arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,6 @@ jobs:
# Due to https://github.com/llvm/llvm-project/issues/155531, we need
# to use llvm@20 currently, and will switch to llvm when it is solved.
brew install llvm@20
rustup default stable

brew install tree
pip3 install --use-pep517 python-dotenv jinja2 requests
go install golang.org/dl/go1.24.3@latest
Expand Down Expand Up @@ -431,8 +429,6 @@ jobs:
# Due to https://github.com/llvm/llvm-project/issues/155531, we need
# to use llvm@20 currently, and will switch to llvm when it is solved.
brew install llvm@20
rustup default stable

brew install tree
pip3 install --use-pep517 python-dotenv jinja2 requests
go install golang.org/dl/go1.24.3@latest
Expand Down Expand Up @@ -604,8 +600,6 @@ jobs:
# Due to https://github.com/llvm/llvm-project/issues/155531, we need
# to use llvm@20 currently, and will switch to llvm when it is solved.
brew install llvm@20
rustup default stable

brew install tree
pip3 install --use-pep517 python-dotenv jinja2 requests
go install golang.org/dl/go1.24.3@latest
Expand Down Expand Up @@ -703,8 +697,6 @@ jobs:
# Due to https://github.com/llvm/llvm-project/issues/155531, we need
# to use llvm@20 currently, and will switch to llvm when it is solved.
brew install llvm@20
rustup default stable

brew install tree
pip3 install --use-pep517 python-dotenv jinja2 requests
go install golang.org/dl/go1.24.3@latest
Expand Down Expand Up @@ -810,8 +802,6 @@ jobs:
# Due to https://github.com/llvm/llvm-project/issues/155531, we need
# to use llvm@20 currently, and will switch to llvm when it is solved.
brew install llvm@20
rustup default stable

brew install tree
pip3 install --use-pep517 python-dotenv jinja2 requests
go install golang.org/dl/go1.24.3@latest
Expand Down Expand Up @@ -917,8 +907,6 @@ jobs:
# Due to https://github.com/llvm/llvm-project/issues/155531, we need
# to use llvm@20 currently, and will switch to llvm when it is solved.
brew install llvm@20
rustup default stable

brew install tree
pip3 install --use-pep517 python-dotenv jinja2 requests
go install golang.org/dl/go1.24.3@latest
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/mac_x64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,6 @@ jobs:
# Due to https://github.com/llvm/llvm-project/issues/155531, we need
# to use llvm@20 currently, and will switch to llvm when it is solved.
brew install llvm@20
rustup default stable

brew install tree
brew install gettext

Expand Down Expand Up @@ -482,8 +480,6 @@ jobs:
# Due to https://github.com/llvm/llvm-project/issues/155531, we need
# to use llvm@20 currently, and will switch to llvm when it is solved.
brew install llvm@20
rustup default stable

brew install tree
pip3 install --use-pep517 python-dotenv jinja2 requests
go install golang.org/dl/go1.24.3@latest
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/tman_full_linux_arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,6 @@ jobs:

cd ${{ github.workspace }}

rustup default stable

df -h .

EXTRA_ARGS="is_clang=true log_level=1 enable_serialized_actions=true ten_rust_enable_gen_cargo_config=false ten_enable_cargo_clean=true ten_enable_go_lint=false ten_enable_rust_incremental_build=false ten_manager_enable_frontend=true ten_enable_ffmpeg_extensions=false ten_enable_nodejs_binding=false ten_enable_python_binding=false ten_enable_go_binding=false ten_enable_ten_rust=true ten_enable_ten_manager=true"
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/tman_full_linux_x64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,16 +139,9 @@ jobs:
export PATH=$(pwd)/core/ten_gn:$PATH
echo $PATH

# Linux x64 debug builds use the stable ASAN target, whose standard
# library is instrumented with AddressSanitizer.
rustup update stable
if [ "${{ matrix.build_type }}" = "debug" ]; then
echo "Setting Rust toolchain to stable with the GNU ASAN target"
rustup default stable
rustup target add --toolchain stable x86_64-unknown-linux-gnuasan
else
echo "Setting Rust toolchain to stable for Linux release build"
rustup default stable
fi

df -h .
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/tman_full_mac_arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,6 @@ jobs:

- name: Install tools and dependencies
run: |
rustup default stable

brew install tree
pip3 install --use-pep517 python-dotenv jinja2
go install golang.org/dl/go1.24.3@latest
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/tman_full_mac_x64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,6 @@ jobs:

- name: Install tools and dependencies
run: |
rustup default stable

brew install tree
brew install gettext

Expand Down
46 changes: 10 additions & 36 deletions .github/workflows/win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,15 @@ jobs:
runs-on: windows-latest
env:
PYTHONIOENCODING: utf-8
# Must use nightly for MinGW, otherwise error[E0554] will be triggered
# when rustc is building tman.exe, because sysinfo 0.32 uses
# "#![cfg_attr(target_os = "windows", feature(windows_by_handle))]"
# to use windows file handle API, which "may not be used on the stable
# release channel"
# For msvc, we also need to use nightly when ten_enable_go_binding=true
# because Go always uses MinGW toolchain on Windows (CGO requires
# GCC-compatible compiler) and the above issues will also happen.
RUSTUP_TOOLCHAIN: ${{ matrix.compiler == 'mingw' && 'nightly-x86_64-pc-windows-gnu' || 'nightly-x86_64-pc-windows-msvc' }}
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -216,19 +225,7 @@ jobs:
go1.24.3 version
go env -w GOFLAGS="-buildvcs=false"

if ("${{ matrix.compiler }}" -eq "mingw") {
# Must use nightly for MinGW, otherwise error[E0554] will be triggered
# when rustc is building tman.exe, because sysinfo 0.32 uses
# "#![cfg_attr(target_os = "windows", feature(windows_by_handle))]"
# to use windows file handle API, which "may not be used on the stable
# release channel"
rustup default nightly-x86_64-pc-windows-gnu
} else {
# For msvc, we also need to use nightly when ten_enable_go_binding=true
# because Go always uses MinGW toolchain on Windows (CGO requires
# GCC-compatible compiler) and the above issues will also happen.
rustup default nightly-x86_64-pc-windows-msvc
}
rustup update $env:RUSTUP_TOOLCHAIN
cargo install --force cbindgen

Write-Output "Verifying Rust toolchain..."
Expand Down Expand Up @@ -283,15 +280,6 @@ jobs:
$argsString = $buildArgs -join " "
Write-Host "Build arguments: $argsString"

# Set toolchain or else toolchain may be switched during build
if ("${{ matrix.compiler }}" -eq "mingw") {
$env:RUSTUP_TOOLCHAIN = "nightly-x86_64-pc-windows-gnu"
}
else {
$env:RUSTUP_TOOLCHAIN = "nightly-x86_64-pc-windows-msvc"
}
echo $env:RUSTUP_TOOLCHAIN

tgn gen win x64 ${{ matrix.build_type }} -- $argsString
tgn build win x64 ${{ matrix.build_type }}

Expand Down Expand Up @@ -1108,13 +1096,6 @@ jobs:
run: |
$ENV:PATH += ";$PWD/core/ten_gn"

if ("${{ matrix.compiler }}" -eq "mingw") {
# Set toolchain to force use of the nightly-x86_64-pc-windows-gnu
# Or else toolchain may be switched to msvc during build
$env:RUSTUP_TOOLCHAIN = "nightly-x86_64-pc-windows-gnu"
echo $env:RUSTUP_TOOLCHAIN
}

cd out/win/x64/
pytest -s tests/ten_runtime/integration/python/

Expand Down Expand Up @@ -1287,13 +1268,6 @@ jobs:
run: |
$ENV:PATH += ";$PWD/core/ten_gn"

if ("${{ matrix.compiler }}" -eq "mingw") {
# Set toolchain to force use of the nightly-x86_64-pc-windows-gnu
# Or else toolchain may be switched to msvc during build
$env:RUSTUP_TOOLCHAIN = "nightly-x86_64-pc-windows-gnu"
echo $env:RUSTUP_TOOLCHAIN
}

cd out/win/x64/
pytest -s tests/ten_runtime/integration/cpp/
# continue-on-error: true
Expand Down
25 changes: 0 additions & 25 deletions build/ten_common/rust/rust.gni
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,6 @@ template("rust_target") {
}
}

if (target == "x86_64-unknown-linux-gnuasan") {
args += [
"--env",
"RUSTUP_TOOLCHAIN=stable",
]
}

args += [
"--target",
target,
Expand Down Expand Up @@ -327,13 +320,6 @@ template("rust_test") {
}
}

if (target == "x86_64-unknown-linux-gnuasan") {
args += [
"--env",
"RUSTUP_TOOLCHAIN=stable",
]
}

args += [
"--target",
target,
Expand Down Expand Up @@ -451,13 +437,6 @@ template("rust_gen_cargo_config") {
rebase_path(_output),
]

args += [ "--compiler" ]
if (is_clang) {
args += [ "clang" ]
} else {
args += [ "gcc" ]
}

if (is_win) {
if (is_mingw) {
# MinGW target for Windows
Expand Down Expand Up @@ -505,10 +484,6 @@ template("rust_gen_cargo_config") {
args += [
"--target",
target,
"--target-os",
target_os,
"--target-arch",
target_cpu,
]

if (enable_sanitizer && ten_rust_enable_gen_cargo_config) {
Expand Down
Loading
Loading