Skip to content

Commit

Permalink
chore: remove shellcheck_makefile submodule (as it's already availabl…
Browse files Browse the repository at this point in the history
…e on AUR)
  • Loading branch information
actionless committed Dec 19, 2024
1 parent 07937bb commit b9f34f1
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 9 deletions.
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ RUN echo ">>>> Preparing build directory:" && \
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 -Syu --noconfirm --needed --color=always \
ruff flake8 python-pylint mypy vulture bandit shellcheck python-coveralls python-validate-pyproject
sudo -u user pikaur --noconfirm --needed --color=always \
-Pi ./PKGBUILD_dev_deps

COPY ./pikaur_test /opt/app-build/pikaur_test
COPY ./maintenance_scripts /opt/app-build/maintenance_scripts/
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile_export
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ENV LANG=en_US.utf8 \
LC_ALL=en_US.UTF-8

RUN echo ">>>> Installing opt and test deps:" && \
pacman -Sy --noconfirm --needed --color=always \
pacman -Sy --noconfirm --needed --color=always --asdeps \
devtools python-pysocks python-defusedxml \
ruff flake8 python-pylint mypy vulture bandit shellcheck python-validate-pyproject && \
echo ">>>> Preparing build directory:" && \
Expand All @@ -44,6 +44,7 @@ RUN echo ">>>> Starting the build:" && \
#ADD ./maintenance_scripts/coveralls_PKGBUILD ./coveralls_PKGBUILD
#RUN sudo -u user pikaur -Pi --noconfirm --color=always coveralls_PKGBUILD
RUN echo ">>>> Installing test deps using Pikaur itself:" && \
sudo -u user pikaur -S --noconfirm --mflags=--skippgpcheck --color=always python-coveralls
sudo -u user pikaur --noconfirm --mflags=--skippgpcheck --color=always \
-Pi ./PKGBUILD_dev_deps

# vim: set ft=dockerfile :
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ shellcheck:

shellcheck_makefile:
# Running shellcheck on Makefile...
$(PYTHON) ./maintenance_scripts/makefile_shellcheck.py --exclude SC2317
shellcheck_makefile --exclude SC2317
# :: shellcheck makefile passed ::

validate_pyproject:
Expand Down
3 changes: 2 additions & 1 deletion PKGBUILD_dev_deps
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
_pkgname=pikaur_dev_deps
#pkgname="${_pkgname}-git"
pkgname="${_pkgname}"
pkgver=1.30.2
pkgver=1.32
pkgrel=1
pkgdesc="Development deps for Pikaur"
arch=('any')
Expand All @@ -20,6 +20,7 @@ depends=(
'python-hatchling' # tag-release
# linting:
ruff flake8 python-pylint mypy vulture bandit shellcheck python-validate-pyproject shellcheck_makefile-git
'python-coveralls'
# pikaur opt deps:
'devtools'
'python-pysocks'
Expand Down

0 comments on commit b9f34f1

Please sign in to comment.