Skip to content

Commit

Permalink
ci: ensure system Python 3.7 is used even if other pythons are available
Browse files Browse the repository at this point in the history
  • Loading branch information
matejcik committed Feb 11, 2020
1 parent c01d04f commit 8c75c94
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ stages:
- deploy

before_script:
- command -v pipenv >/dev/null && pipenv sync
- command -v pipenv >/dev/null && pipenv sync --python=/usr/bin/python3

.core_job:
only:
Expand Down
9 changes: 9 additions & 0 deletions ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,15 @@ RUN if [ "${FULLDEPS_TESTING}" = "1" ]; then \
cd Python-${PYTHON38VER}${PYTHONSUBVER}/ && ./configure && make && make install ; \
fi

# remove symlinks to newly installed pythons
RUN cd /usr/local/bin; \
rm -f 2to3; \
rm -f python3; \
rm -f python3-config; \
rm -f pydoc3; \
rm -f pip3; \
rm -f pyvenv;

# install dependencies from toolchain source build

RUN if [ "${TOOLCHAIN_FLAVOR}" = "src" ]; then \
Expand Down

0 comments on commit 8c75c94

Please sign in to comment.