Skip to content

Commit 2763c1f

Browse files
authored
Merge branch 'master' into fix-mathjax-docs
2 parents 2455d67 + ca6e113 commit 2763c1f

File tree

2 files changed

+35
-13
lines changed

2 files changed

+35
-13
lines changed

.github/workflows/ci-build-checks.yaml

Lines changed: 34 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,38 +24,52 @@ on:
2424
types:
2525
- checks_requested
2626

27+
concurrency:
28+
cancel-in-progress: true
29+
group: ${{github.workflow}}-${{github.event.pull_request.number||github.ref}}
30+
2731
permissions: read-all
2832

2933
jobs:
3034
wheel-build:
3135
name: Wheel test
3236
runs-on: ubuntu-22.04
37+
timeout-minutes: 60
3338

3439
steps:
35-
- uses: actions/checkout@544eadc6bf3d226fd7a7a9f0dc5b5bf7ca0675b9 # v1
36-
- uses: actions/setup-python@0f07f7f756721ebd886c2462646a35f78a8bc4de # v1
40+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
41+
- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v5
3742
with:
3843
python-version: '3.10'
3944
architecture: 'x64'
45+
cache: pip
4046
- name: Install Bazel on CI
4147
run: ./scripts/ci_install.sh
42-
- name: Configure CI TF
43-
run: echo "Y\n" | ./configure.sh
4448
- name: Build Wheel Test
4549
run: ./scripts/build_pip_package_test.sh
4650
- name: Test Wheel
4751
run: ./scripts/run_example.sh
4852

4953
bazel-tests:
5054
name: Library tests
51-
runs-on: ubuntu-22.04
55+
runs-on: linux-x86-n2-32
56+
container:
57+
image: us-docker.pkg.dev/ml-oss-artifacts-published/ml-public-container/ml-build:latest
58+
timeout-minutes: 60
5259

5360
steps:
54-
- uses: actions/checkout@544eadc6bf3d226fd7a7a9f0dc5b5bf7ca0675b9 # v1
55-
- uses: actions/setup-python@0f07f7f756721ebd886c2462646a35f78a8bc4de # v1
61+
- name: Adjust the ml-build runner to our needs
62+
run: |
63+
# lsb-release (needed by setup-python) is missing in ml-build runners
64+
sudo apt-get update && sudo apt-get install -y lsb-release
65+
# This file, though it's empty, hangs the Bazel install step.
66+
rm -f /etc/bazel.bazelrc
67+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
68+
- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v5
5669
with:
5770
python-version: '3.10'
5871
architecture: 'x64'
72+
cache: pip
5973
- name: Install Bazel on CI
6074
run: ./scripts/ci_install.sh
6175
- name: Configure CI TF
@@ -87,21 +101,28 @@ jobs:
87101

88102
tutorials-test:
89103
name: Tutorial tests
90-
runs-on: ubuntu-22.04
91-
needs: wheel-build
104+
runs-on: linux-x86-n2-32
105+
container:
106+
image: us-docker.pkg.dev/ml-oss-artifacts-published/ml-public-container/ml-build:latest
107+
timeout-minutes: 60
92108

93109
steps:
94-
- uses: actions/checkout@544eadc6bf3d226fd7a7a9f0dc5b5bf7ca0675b9 # v1
95-
- uses: actions/setup-python@0f07f7f756721ebd886c2462646a35f78a8bc4de # v1
110+
- name: Adjust the ml-build runner to our needs
111+
run: |
112+
# lsb-release (needed by setup-python) is missing in ml-build runners
113+
sudo apt-get update && sudo apt-get install -y lsb-release
114+
# This file, though it's empty, hangs the Bazel install step.
115+
rm -f /etc/bazel.bazelrc
116+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
117+
- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v5
96118
with:
97119
python-version: '3.10'
98120
architecture: 'x64'
121+
cache: pip
99122
- name: Install notebook dependencies
100123
run: pip install --upgrade pip seaborn==0.10.0
101124
- name: Install Bazel on CI
102125
run: ./scripts/ci_install.sh
103-
- name: Configure CI TF
104-
run: echo "Y\n" | ./configure.sh
105126
- name: Build Wheel
106127
run: ./scripts/build_pip_package_test.sh
107128
- name: Test Notebooks

tensorflow_quantum/python/optimizers/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ py_test(
3939
py_test(
4040
name = "spsa_minimizer_test",
4141
srcs = ["spsa_minimizer_test.py"],
42+
flaky = True,
4243
python_version = "PY3",
4344
deps = [
4445
":spsa_minimizer",

0 commit comments

Comments
 (0)