Skip to content

Improve CI testing and release process #2623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 14, 2021
Merged

Improve CI testing and release process #2623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e364e7
* Test CI with new auditwheel location
seanpmorgan Dec 14, 2021
26cf240
* Use new manylinux policy
seanpmorgan Dec 14, 2021
b20be59
* Use bazeliskrc
seanpmorgan Dec 14, 2021
6f1911f
* Use bazeliskrc
seanpmorgan Dec 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .bazeliskrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
USE_BAZEL_VERSION=3.7.2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tensorflow uses 4.2.1 now.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, lets merge this as CI fix and then can make separate PR to increase bazel version

1 change: 0 additions & 1 deletion .bazelversion
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion tools/docker/build_wheel.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ COPY requirements.txt .
RUN python -m pip install -r requirements.txt

COPY ./ /addons
RUN rm /addons/.bazelversion
RUN rm /addons/.bazeliskrc
WORKDIR /addons

# -------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion tools/docker/cpu_tests.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG TF_VERSION=2.7.0
RUN pip install --default-timeout=1000 tensorflow-cpu==$TF_VERSION

RUN apt-get update && apt-get install -y sudo rsync
COPY tools/install_deps/install_bazelisk.sh .bazelversion ./
COPY tools/install_deps/install_bazelisk.sh .bazeliskrc ./
RUN bash install_bazelisk.sh

COPY requirements.txt ./
Expand Down
4 changes: 2 additions & 2 deletions tools/docker/sanity_check.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ COPY tools/install_deps/tensorflow-cpu.txt ./
RUN pip install --default-timeout=1000 -r tensorflow-cpu.txt

RUN apt-get update && apt-get install sudo
COPY tools/install_deps/install_bazelisk.sh .bazelversion ./
COPY tools/install_deps/install_bazelisk.sh .bazeliskrc ./
RUN bash install_bazelisk.sh

COPY ./ /addons
Expand Down Expand Up @@ -109,7 +109,7 @@ COPY tools/install_deps/pytest.txt ./
RUN pip install -r pytest.txt

RUN apt-get update && apt-get install -y sudo rsync
COPY tools/install_deps/install_bazelisk.sh .bazelversion ./
COPY tools/install_deps/install_bazelisk.sh .bazeliskrc ./
RUN bash install_bazelisk.sh

COPY ./ /addons
Expand Down
2 changes: 1 addition & 1 deletion tools/releases/tf_auditwheel_patch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ set -e -x

SITE_PKG_LOCATION=$(python -c "import site; print(site.getsitepackages()[0])")
TF_SHARED_LIBRARY_NAME=$(grep -r TF_SHARED_LIBRARY_NAME .bazelrc | awk -F= '{print$2}')
POLICY_JSON="${SITE_PKG_LOCATION}/auditwheel/policy/policy.json"
POLICY_JSON="${SITE_PKG_LOCATION}/auditwheel/policy/manylinux-policy.json"
sed -i "s/libresolv.so.2\"/libresolv.so.2\", $TF_SHARED_LIBRARY_NAME/g" $POLICY_JSON