Skip to content

Commit bf42518

Browse files
committed
align env vars about min and max clang version
1 parent 65e08a7 commit bf42518

3 files changed

Lines changed: 7 additions & 6 deletions

File tree

.github/workflows/run-dev-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@ jobs:
9898

9999
- name: Run test suite
100100
env:
101-
MIN_CLANG_VERSION: "11"
102-
MAX_CLANG_VERSION: "22"
101+
MIN_CLANG_TOOLS_VERSION: "11"
102+
MAX_CLANG_TOOLS_VERSION: "22"
103103
shell: nu {0}
104104
run: |-
105-
let max_ver = $env.MAX_CLANG_VERSION | into int
106-
let min_ver = $env.MIN_CLANG_VERSION | into int
105+
let max_ver = $env.MAX_CLANG_TOOLS_VERSION | into int
106+
let min_ver = $env.MIN_CLANG_TOOLS_VERSION | into int
107107
for $ver in ($min_ver..$max_ver) {
108108
print $"::group::Testing with clang v($ver)"
109109
with-env { CLANG_VERSION: $"($ver)" } {

clang-installer/src/downloader/static_dist.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ pub enum StaticDistDownloadError {
4242
#[error("Failed to parse the SHA512 sum file")]
4343
Sha512Corruption,
4444
}
45-
const MIN_CLANG_TOOLS_VERSION: u8 = 9;
46-
pub(crate) const MAX_CLANG_TOOLS_VERSION: u8 = 21;
45+
const MIN_CLANG_TOOLS_VERSION: u8 = 11;
46+
pub(crate) const MAX_CLANG_TOOLS_VERSION: u8 = 22;
4747
const CLANG_TOOLS_REPO: &str = "https://github.com/cpp-linter/clang-tools-static-binaries";
4848
const CLANG_TOOLS_TAG: &str = "master-6e612956";
4949

clang-installer/src/version.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,7 @@ mod tests {
329329
let clang_version = option_env!("CLANG_VERSION").unwrap_or("12.0.1");
330330
for tool in [ClangTool::ClangFormat, ClangTool::ClangTidy] {
331331
let version_req = VersionReq::parse(clang_version).unwrap();
332+
println!("Installing {tool} with version requirement: {version_req}");
332333
let clang_path = RequestedVersion::Requirement(version_req.clone())
333334
.eval_tool(&tool, false, None)
334335
.await

0 commit comments

Comments
 (0)