Skip to content

Commit e2ddb73

Browse files
committed
[fix] CI fail for protobuf update.
- Also include the horovod compile fail on macOS(They was caused by the same reason)
1 parent 82fcf45 commit e2ddb73

File tree

8 files changed

+32
-0
lines changed

8 files changed

+32
-0
lines changed

.github/workflows/ci_test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ jobs:
9191
run: |
9292
# Run on all notebooks to prevent upstream change.
9393
echo "Check formatting with nbfmt:"
94+
python3 -m pip install --upgrade protobuf==3.20.0
9495
python3 -m tensorflow_docs.tools.nbfmt --test \
9596
$(find docs/tutorials/ -type f -name *.ipynb)
9697
nblint:
@@ -105,6 +106,7 @@ jobs:
105106
run: |
106107
# Run on all notebooks to prevent upstream change.
107108
echo "Lint check with nblint:"
109+
python3 -m pip install --upgrade protobuf==3.20.0
108110
python3 -m tensorflow_docs.tools.nblint \
109111
--arg=repo:tensorflow/recommenders-addons \
110112
--exclude_lint=tensorflow::button_colab \

.github/workflows/make_wheel_Windows_x86.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ fi
1010
python -m pip install --default-timeout=1000 wheel setuptools tensorflow==$TF_VERSION horovod==$HOROVOD_VERSION
1111
bash ./tools/testing/build_and_run_tests.sh
1212

13+
python -m pip install --upgrade protobuf==3.20.0
14+
1315
python configure.py
1416

1517
bazel.exe build --no-cache \

.github/workflows/make_wheel_macOS_arm64.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export TF_NEED_CUDA=0
1111

1212
python --version
1313

14+
RUN python -m pip install --upgrade protobuf==3.20.0
1415
python configure.py
1516

1617
bazel build \

.github/workflows/make_wheel_macOS_x86.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ python --version
99
brew install open-mpi
1010

1111
python -m pip install --default-timeout=1000 delocate==0.9.1 wheel setuptools tensorflow==$TF_VERSION
12+
python -m pip install --upgrade protobuf==3.20.0
13+
1214
bash tools/docker/install/install_horovod.sh $HOROVOD_VERSION --only-cpu
1315

1416
bash tools/testing/build_and_run_tests.sh

.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
pip install --default-timeout=1000 -r tools/install_deps/pytest.txt -r tools/install_deps/tensorflow-cpu.txt -r requirements.txt
3535
sudo apt install -y redis > /dev/null 2> /dev/null
3636
bash tools/install_deps/install_bazelisk.sh ./
37+
python -m pip install --upgrade protobuf==3.20.0
3738
python configure.py
3839
bazel test -c opt -k --test_timeout 300,450,1200,3600 --test_output=errors //tensorflow_recommenders_addons/...
3940
release-wheel:

tools/docker/build_wheel.Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ RUN python -m pip install -r /install_deps/pytest.txt
4343
COPY requirements.txt .
4444
RUN python -m pip install -r requirements.txt
4545

46+
RUN python -m pip install --upgrade protobuf==3.20.0
47+
4648
COPY ./ /recommenders-addons
4749
WORKDIR /recommenders-addons
4850

@@ -86,6 +88,8 @@ ARG TF_VERSION
8688
ARG TF_NAME
8789
RUN python -m pip install --default-timeout=1000 $TF_NAME==$TF_VERSION
8890

91+
RUN python -m pip install --upgrade protobuf==3.20.0
92+
8993
COPY --from=make_wheel /recommenders-addons/wheelhouse/ /recommenders-addons/wheelhouse/
9094
RUN pip install /recommenders-addons/wheelhouse/*.whl
9195

tools/docker/cpu_tests.Dockerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ ARG HOROVOD_VERSION="0.23.0"
88

99
RUN pip install --default-timeout=1000 tensorflow-cpu==$TF_VERSION
1010

11+
RUN python -m pip install --upgrade protobuf==3.20.0
12+
1113
RUN apt-get update && apt-get install -y sudo rsync cmake openmpi-bin libopenmpi-dev
1214

1315
COPY tools/docker/install/install_bazel.sh /install/
@@ -24,6 +26,9 @@ RUN pip install -r pytest.txt pytest-cov
2426

2527
COPY ./ /recommenders-addons
2628
WORKDIR recommenders-addons
29+
30+
RUN python -m pip install --upgrade protobuf==3.20.0
31+
2732
RUN python configure.py
2833
RUN pip install -e ./
2934
RUN --mount=type=cache,id=cache_bazel,target=/root/.cache/bazel \
@@ -42,6 +47,8 @@ RUN pip install --default-timeout=1000 --upgrade --force-reinstall -r tensorflow
4247

4348
COPY --from=0 /recommenders-addons/artifacts /artifacts
4449

50+
RUN python -m pip install --upgrade protobuf==3.20.0
51+
4552
RUN pip install /artifacts/tensorflow_recommenders_addons-*.whl
4653

4754
# check that we didnd't forget to add a py file to

tools/docker/sanity_check.Dockerfile

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ COPY tools/install_deps/yapf.txt ./
66
RUN pip install -r yapf.txt
77
COPY ./ /recommenders-addons
88
WORKDIR /recommenders-addons
9+
10+
RUN python -m pip install --upgrade protobuf==3.20.0
911
RUN python tools/check_python_format.py
1012
RUN touch /ok.txt
1113

@@ -30,6 +32,9 @@ COPY ./ /recommenders-addons
3032
RUN pip install -e /recommenders-addons
3133

3234
WORKDIR /recommenders-addons
35+
36+
RUN python -m pip install --upgrade protobuf==3.20.0
37+
3338
RUN python configure.py
3439
RUN --mount=type=cache,id=cache_bazel,target=/root/.cache/bazel \
3540
bash tools/install_so_files.sh
@@ -51,6 +56,9 @@ RUN ./install_bazel.sh $USE_BAZEL_VERSION
5156

5257
COPY ./ /recommenders-addons
5358
WORKDIR /recommenders-addons
59+
60+
RUN python -m pip install --upgrade protobuf==3.20.0
61+
5462
RUN python ./configure.py
5563
RUN --mount=type=cache,id=cache_bazel,target=/root/.cache/bazel \
5664
bazel build --nobuild -- //tensorflow_recommenders_addons/...
@@ -104,6 +112,8 @@ RUN ./install_bazel.sh $USE_BAZEL_VERSION
104112
COPY ./ /recommenders-addons
105113
WORKDIR /recommenders-addons
106114

115+
RUN python -m pip install --upgrade protobuf==3.20.0
116+
107117
RUN python configure.py
108118
RUN --mount=type=cache,id=cache_bazel,target=/root/.cache/bazel \
109119
bash tools/install_so_files.sh
@@ -131,6 +141,9 @@ RUN ./install_bazel.sh $USE_BAZEL_VERSION
131141

132142
COPY ./ /recommenders-addons
133143
WORKDIR /recommenders-addons
144+
145+
RUN python -m pip install --upgrade protobuf==3.20.0
146+
134147
RUN python configure.py
135148
RUN --mount=type=cache,id=cache_bazel,target=/root/.cache/bazel \
136149
bash tools/install_so_files.sh

0 commit comments

Comments
 (0)