Skip to content

Commit

Permalink
Rollup merge of #109952 - jyn514:python-comment, r=pietroalbini
Browse files Browse the repository at this point in the history
Move comment about python2 closer to the place it's used

Addresses #109267 (comment).

r? `@pietroalbini`
  • Loading branch information
JohnTitor authored Apr 5, 2023
2 parents ee63b65 + 8a39955 commit 616dde1
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/ci/docker/host-x86_64/mingw-check-tidy/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
FROM ubuntu:22.04

ARG DEBIAN_FRONTEND=noninteractive
# NOTE: intentionally uses python2 for x.py so we can test it still works.
# validate-toolstate only runs in our CI, so it's ok for it to only support python3.
RUN apt-get update && apt-get install -y --no-install-recommends \
g++ \
make \
Expand Down Expand Up @@ -33,4 +31,6 @@ RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-require
COPY host-x86_64/mingw-check/validate-toolstate.sh /scripts/
COPY host-x86_64/mingw-check/validate-error-codes.sh /scripts/

# NOTE: intentionally uses python2 for x.py so we can test it still works.
# validate-toolstate only runs in our CI, so it's ok for it to only support python3.
ENV SCRIPT python2.7 ../x.py test --stage 0 src/tools/tidy tidyselftest

0 comments on commit 616dde1

Please sign in to comment.