Skip to content

Commit

Permalink
chore(dockerfile): try switching to upstream coveralls again
Browse files Browse the repository at this point in the history
  • Loading branch information
actionless committed Aug 20, 2024
1 parent 2a95259 commit 5327db7
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 55 deletions.
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,8 @@ RUN echo ">>>> Installing opt deps:" && \
COPY ./pikaur_meta_helpers /opt/app-build/pikaur_meta_helpers
#RUN sudo -u user python -um pikaur_meta_helpers.pidowngrade python-coverage '7.4.1-1' # up to 7.4.4
RUN echo ">>>> Installing test deps using Pikaur itself:" && \
sudo -u user pikaur -S --noconfirm --needed --color=always iputils python-virtualenv python-tqdm \
ruff flake8 python-pylint mypy vulture bandit shellcheck # @TODO: python-coveralls is temporary broken
#RUN sudo -u user python -um pikaur_meta_helpers.pidowngrade python-pycodestyle '2.9.1-2'
sudo -u user pikaur -Syu --noconfirm --needed --color=always iputils python-virtualenv python-tqdm \
ruff flake8 python-pylint mypy vulture bandit shellcheck python-coveralls

COPY ./pikaur_test /opt/app-build/pikaur_test
COPY ./maintenance_scripts /opt/app-build/maintenance_scripts/
Expand Down
9 changes: 5 additions & 4 deletions Dockerfile_export
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ RUN echo ">>>> Installing opt and test deps:" && \
pacman -Sy --noconfirm --needed --color=always \
devtools python-pysocks python-defusedxml \
iputils python-virtualenv \
ruff flake8 python-pylint mypy vulture bandit shellcheck && \
ruff flake8 python-pylint mypy vulture bandit shellcheck python-coveralls && \
echo ">>>> Preparing build directory:" && \
chown -R user /opt/app-build/

Expand All @@ -37,12 +37,13 @@ RUN echo ">>>> Starting the build:" && \
./maintenance_scripts/changelog.sh > CHANGELOG && \
sudo -u user makepkg -fsi --noconfirm && \
rm -fr ./src/ ./pkg/
# Workaround for broken coveralls v1:
#COPY ./pikaur_meta_helpers /opt/app-build/pikaur_meta_helpers
#RUN sudo -u user python -um pikaur_meta_helpers.pidowngrade python-coverage '7.4.1-1' # up to 7.4.4
#RUN echo ">>>> Installing test deps using Pikaur itself:" && \
# sudo -u user pikaur -S --noconfirm --mflags=--skippgpcheck --color=always python-coveralls
# Workaround for broken coveralls:
ADD ./maintenance_scripts/coveralls_PKGBUILD ./coveralls_PKGBUILD
RUN sudo -u user pikaur -Pi --noconfirm --color=always coveralls_PKGBUILD
# Workaround for broken coveralls v2:
#ADD ./maintenance_scripts/coveralls_PKGBUILD ./coveralls_PKGBUILD
#RUN sudo -u user pikaur -Pi --noconfirm --color=always coveralls_PKGBUILD

# vim: set ft=dockerfile :
48 changes: 0 additions & 48 deletions maintenance_scripts/coveralls_PKGBUILD

This file was deleted.

0 comments on commit 5327db7

Please sign in to comment.