Skip to content
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.

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

upgrade pre-commit tools in docker #43534

Merged
merged 11 commits into from
Jun 23, 2022

Conversation

betterpig
Copy link
Contributor

@betterpig betterpig commented Jun 15, 2022

PR types

Others

PR changes

Others

Describe

  • python36 support pre-commit<=2.1.1

image

  • update cuda11.2 source image public key to avoid GPG problem, see here
    image

@paddle-bot-old
Copy link

你的PR提交成功,感谢你对开源项目的贡献!
请关注后续CI自动化测试结果,详情请参考Paddle-CI手册
Your PR has been submitted. Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

@betterpig betterpig closed this Jun 22, 2022
@betterpig betterpig reopened this Jun 22, 2022
@tianshuo78520a
Copy link
Contributor

LGTM

@@ -45,8 +50,7 @@ RUN wget -q https://cmake.org/files/v3.16/cmake-3.16.0-Linux-x86_64.tar.gz && ta
ENV PATH=/home/cmake-3.16.0-Linux-x86_64/bin:$PATH


RUN apt-get update && \
apt-get install -y python2.7 python2.7-dev \
RUN apt-get install -y --fix-missing python2.7 python2.7-dev \
Copy link
Contributor

Choose a reason for hiding this comment

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

这里为什么要这样改?需要把apt-get update删掉吗?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

已去掉修改。

Copy link
Member

@zhhsplendid zhhsplendid left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@zhhsplendid zhhsplendid left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@pangyoki pangyoki left a comment

Choose a reason for hiding this comment

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

LGTM

@betterpig betterpig merged commit dbf92d4 into PaddlePaddle:develop Jun 23, 2022
sneaxiy pushed a commit to sneaxiy/Paddle that referenced this pull request Jun 27, 2022
* upgrade pre-commit tools in docker

* python36 support pre-commit<=2.1.1

* upgrade pip; remove old clang-format; remove redundant apt update

* remove redundant apt-get update

* remove duplicate apt-get update that will cause cinn download fail

* remove duplicate pip upgrade

* add --fix-missing to avoid cinn docker build fail

* remove duplicate apt-get update in make_cinn_docker

* make cinn command in the end

* solve gpg problem

* remove unneccessary modification
zhhsplendid added a commit that referenced this pull request Jun 27, 2022
The paddle-cinn failed recently and block all PRs from merging. We found the key error reason from the log:

![b207bbfd3ebfabb2141a88b85241420b](https://user-images.githubusercontent.com/7913861/175882664-4dd14059-b716-44c4-a975-528de17ace46.png)

The CI environment didn't contain llvm.

We then debug and found #43534 deleted the llvm due to clang-format upgrade:
![f9d07b8e3c2b2cba7a790716961d98cf](https://user-images.githubusercontent.com/7913861/175883020-1a29c538-e511-4ada-a899-9b3ced3c0ae2.png)

So this PR added the llvm back. However, `clang-llvm-3.8.0` contains `clang-format-3.8`, so we modified the old command `cp -r` to `cp -rn`, which could ignore the installed `clang-format-13`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants