Skip to content

Commit

Permalink
Update CI/release to Rust 1.80 (#297)
Browse files Browse the repository at this point in the history
  • Loading branch information
idavis authored Sep 16, 2024
1 parent feeef97 commit caf7234
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .ado/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ schedules:

variables:
CARGO_TERM_COLOR: always
RUST_TOOLCHAIN_VERSION: "1.78"
RUST_TOOLCHAIN_VERSION: "1.80.1"
PYTHON_VERSION: "3.11"
LLVM_VERSION: 14

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
- name: Setup rust toolchain
uses: ./.github/actions/rust-toolchain
with:
toolchain: 1.78.0
toolchain: 1.80.1
components: rustfmt clippy
- shell: pwsh
run: |
Expand Down
15 changes: 15 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
[workspace]
members = ["pyqir", "qirlib"]
resolver = "2"

[workspace.package]
authors = ["Microsoft"]
version = "0.10.5"
edition = "2021"
license = "MIT"
homepage = "https://github.com/qir-alliance/pyqir"
repository = "https://github.com/qir-alliance/pyqir"

4 changes: 2 additions & 2 deletions eng/utils.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ function Get-LLVMFeatureVersion {
$env:PYQIR_LLVM_FEATURE_VERSION
}
else {
# "llvm11-0", "llvm12-0", "llvm13-0", "llvm14-0"
# "llvm11-0", "llvm12-0", "llvm13-0", "llvm14-0", "llvm15-0"
"llvm14-0"
}
}
Expand Down Expand Up @@ -296,7 +296,7 @@ function install-llvm {
[ValidateSet("download", "build")]
[string]$operation,
[Parameter(Mandatory)]
[ValidateSet("llvm11-0", "llvm12-0", "llvm13-0", "llvm14-0")]
[ValidateSet("llvm11-0", "llvm12-0", "llvm13-0", "llvm14-0", "llvm15-0")]
[string]$feature
)

Expand Down
15 changes: 9 additions & 6 deletions pyqir/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
[package]
authors = ["Microsoft"]
name = "pyqir"
version = "0.10.5"
edition = "2021"
license = "MIT"
description = "PyQIR parses, generates and evaluates the Quantum Intermediate Representation."
readme = "README.md"
homepage = "https://github.com/qir-alliance/pyqir"
repository = "https://github.com/qir-alliance/pyqir"
authors.workspace = true
version.workspace = true
edition.workspace = true
license.workspace = true
homepage.workspace = true
repository.workspace = true


[dependencies]
const-str = "0.5"
llvm-sys-110 = { package = "llvm-sys", version = "110.0", optional = true }
llvm-sys-120 = { package = "llvm-sys", version = "120.3", optional = true }
llvm-sys-130 = { package = "llvm-sys", version = "130.1", optional = true }
llvm-sys-140 = { package = "llvm-sys", version = "140.1", optional = true }
llvm-sys-150 = { package = "llvm-sys", version = "150.2", optional = true }
pyo3 = { version = "0.19", features = ["abi3-py38", "extension-module"] }
qirlib = { path = "../qirlib" }

Expand All @@ -23,6 +25,7 @@ llvm11-0 = ["llvm-sys-110", "qirlib/llvm11-0"]
llvm12-0 = ["llvm-sys-120", "qirlib/llvm12-0"]
llvm13-0 = ["llvm-sys-130", "qirlib/llvm13-0"]
llvm14-0 = ["llvm-sys-140", "qirlib/llvm14-0"]
llvm15-0 = ["llvm-sys-150", "qirlib/llvm15-0"]

[lib]
crate-type = ["cdylib"]
Expand Down
17 changes: 10 additions & 7 deletions qirlib/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
[package]
name = "qirlib"
version = "0.10.5"
edition = "2021"
license = "MIT"
description = "Base Profile QIR library"
build = "build.rs"
readme = "README.md"
homepage = "https://github.com/qir-alliance/pyqir"
repository = "https://github.com/qir-alliance/pyqir"
rust-version = "1.64"
authors.workspace = true
version.workspace = true
edition.workspace = true
license.workspace = true
homepage.workspace = true
repository.workspace = true

[dependencies]
bitvec = "1.0"
Expand All @@ -18,6 +17,7 @@ llvm-sys-110 = { package = "llvm-sys", version = "110.0", optional = true }
llvm-sys-120 = { package = "llvm-sys", version = "120.3", optional = true }
llvm-sys-130 = { package = "llvm-sys", version = "130.1", optional = true }
llvm-sys-140 = { package = "llvm-sys", version = "140.1", optional = true }
llvm-sys-150 = { package = "llvm-sys", version = "150.2", optional = true }
log = "0.4"
mut_static = "5.0"

Expand All @@ -37,6 +37,7 @@ llvm11-0 = ["llvm-sys-110"]
llvm12-0 = ["llvm-sys-120"]
llvm13-0 = ["llvm-sys-130"]
llvm14-0 = ["llvm-sys-140"]
llvm15-0 = ["llvm-sys-150"]

# default to use llvm-sys for llvm linking
default = ["external-llvm-linking"]
Expand All @@ -48,6 +49,7 @@ llvm11-0-no-llvm-linking = ["llvm11-0", "no-llvm-linking", "llvm-sys-110/disable
llvm12-0-no-llvm-linking = ["llvm12-0", "no-llvm-linking", "llvm-sys-120/disable-alltargets-init", "llvm-sys-120/no-llvm-linking"]
llvm13-0-no-llvm-linking = ["llvm13-0", "no-llvm-linking", "llvm-sys-130/disable-alltargets-init", "llvm-sys-130/no-llvm-linking"]
llvm14-0-no-llvm-linking = ["llvm14-0", "no-llvm-linking", "llvm-sys-140/disable-alltargets-init", "llvm-sys-140/no-llvm-linking"]
llvm15-0-no-llvm-linking = ["llvm15-0", "no-llvm-linking", "llvm-sys-150/disable-alltargets-init", "llvm-sys-150/no-llvm-linking"]

no-llvm-linking = []

Expand All @@ -57,6 +59,7 @@ llvm11-0-qirlib-llvm-linking = ["llvm11-0", "qirlib-llvm-linking", "llvm-sys-110
llvm12-0-qirlib-llvm-linking = ["llvm12-0", "qirlib-llvm-linking", "llvm-sys-120/disable-alltargets-init", "llvm-sys-120/no-llvm-linking"]
llvm13-0-qirlib-llvm-linking = ["llvm13-0", "qirlib-llvm-linking", "llvm-sys-130/disable-alltargets-init", "llvm-sys-130/no-llvm-linking"]
llvm14-0-qirlib-llvm-linking = ["llvm14-0", "qirlib-llvm-linking", "llvm-sys-140/disable-alltargets-init", "llvm-sys-140/no-llvm-linking"]
llvm15-0-qirlib-llvm-linking = ["llvm15-0", "qirlib-llvm-linking", "llvm-sys-150/disable-alltargets-init", "llvm-sys-150/no-llvm-linking"]

qirlib-llvm-linking = []

Expand Down

0 comments on commit caf7234

Please sign in to comment.