Skip to content

Commit 0c765ea

Browse files
authored
Merge branch 'main' into add-qasm3-defcals
2 parents a7d9c04 + ce16e1a commit 0c765ea

File tree

278 files changed

+30172
-9607
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

278 files changed

+30172
-9607
lines changed

.github/CODEOWNERS

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
# with an expected responsibility to review and maintain those subsections of
77
# the repository.
88
#
9-
# The @Qiskit/terra-core team is the group who're responsible for the
10-
# entire qiskit-terra project and are empowered to approve merge code in any
9+
# The @Qiskit/terra-core team is the core group who're responsible for the
10+
# entire Qiskit SDK project and are empowered to approve and merge code in any
1111
# part of the repository. Any member of the terra-core group should not be
1212
# listed in this file as it's redundant.
1313
#
@@ -23,8 +23,7 @@
2323
* @Qiskit/terra-core
2424

2525
# Qiskit folders (also their corresponding tests)
26-
providers/ @Qiskit/terra-core @jyu00
27-
visualization/ @Qiskit/terra-core @nonhermitian
26+
providers/ @Qiskit/terra-core @kt474
2827
primitives/ @Qiskit/terra-core @Qiskit/qiskit-primitives
2928
# Override the release notes directories to have _no_ code owners, so any review
3029
# from somebody with write access is acceptable.

.github/workflows/miri.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ jobs:
1414
name: Miri
1515
runs-on: ubuntu-latest
1616
env:
17-
RUSTUP_TOOLCHAIN: nightly-2024-05-24
17+
RUSTUP_TOOLCHAIN: nightly-2025-08-11
1818

1919
steps:
2020
- uses: actions/checkout@v4
2121

2222
- name: Install Rust toolchain
2323
uses: dtolnay/rust-toolchain@master
2424
with:
25-
toolchain: nightly-2024-05-24
25+
toolchain: nightly-2025-08-11
2626
components: miri
2727

2828
- name: Prepare Miri

.github/workflows/wheels-build.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,19 +100,12 @@ jobs:
100100
run: |
101101
set -e
102102
mkdir -p "$PGO_WORK_DIR"
103-
if [[ `uname -m` == "aarch64" ]] ; then
104-
INSTALL_RUST_PATH=tools/install_rust_msrv.sh
105-
RUST_TOOLCHAIN=1.79
106-
else
107-
INSTALL_RUST_PATH=tools/install_rust.sh
108-
RUST_TOOLCHAIN=stable
109-
fi
110103
cat >>"$GITHUB_ENV" <<EOF
111-
CIBW_BEFORE_ALL_LINUX=yum install -y wget && {package}/$INSTALL_RUST_PATH
104+
CIBW_BEFORE_ALL_LINUX=yum install -y wget && {package}/tools/install_rust.sh
112105
CIBW_BEFORE_BUILD=bash ./tools/build_pgo.sh $PGO_WORK_DIR $PGO_OUT_PATH
113106
CIBW_ENVIRONMENT=RUSTUP_TOOLCHAIN=stable RUSTFLAGS='-Cprofile-use=$PGO_OUT_PATH -Cllvm-args=-pgo-warn-missing-function'
114107
CIBW_ENVIRONMENT_MACOS=MACOSX_DEPLOYMENT_TARGET='10.12' RUSTUP_TOOLCHAIN=stable RUSTFLAGS='-Cprofile-use=$PGO_OUT_PATH -Cllvm-args=-pgo-warn-missing-function'
115-
CIBW_ENVIRONMENT_LINUX=RUSTUP_TOOLCHAIN=$RUST_TOOLCHAIN RUSTFLAGS='-Cprofile-use=$PGO_OUT_PATH -Cllvm-args=-pgo-warn-missing-function' PATH="\$PATH:\$HOME/.cargo/bin" CARGO_NET_GIT_FETCH_WITH_CLI="true"
108+
CIBW_ENVIRONMENT_LINUX=RUSTUP_TOOLCHAIN=stable RUSTFLAGS='-Cprofile-use=$PGO_OUT_PATH -Cllvm-args=-pgo-warn-missing-function' PATH="\$PATH:\$HOME/.cargo/bin" CARGO_NET_GIT_FETCH_WITH_CLI="true"
116109
EOF
117110
env:
118111
PGO_WORK_DIR: ${{ github.workspace }}/pgo-data

0 commit comments

Comments
 (0)