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

Update pre-commit to run pre-push #355

Merged
merged 3 commits into from
Jul 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: "Checkout source code at current commit"
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Prepare tags for Docker image
if: (github.event_name == 'release' && github.event.action == 'published') || github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
id: prepare
Expand Down Expand Up @@ -59,22 +59,22 @@ jobs:
echo "slim-tags=${SLIM_TAGS}" >> "$GITHUB_OUTPUT"
printf "SLIM_TAGS are %s\n" "${SLIM_TAGS}"
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2
- name: Login to DockerHub
if: (github.event_name == 'release' && github.event.action == 'published') || github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
- name: "Build and push full docker image to DockerHub"
id: docker_full_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
push: ${{ (github.event_name == 'release' && github.event.action == 'published') || github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
tags: ${{ steps.prepare.outputs.tags }}
- name: "Build and push slim docker image to DockerHub"
id: docker_slim_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
file: ./Dockerfile.slim
push: ${{ (github.event_name == 'release' && github.event.action == 'published') || github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ RUN apk --update --no-cache add \
py3-cffi && \
python3 -m pip install --upgrade pip setuptools wheel && \
pip3 install --no-cache-dir \
cryptography==37.0.4 \
PyYAML==5.4.1 \
awscli==1.25.43 \
cryptography==41.0.2 \
PyYAML==6.0.1 \
awscli==1.29.9 \
boto==2.49.0 \
boto3==1.24.43 \
boto3==1.28.9 \
iteration-utilities==0.11.0 \
PyGithub==1.55 && \
PyGithub==1.59 && \
git config --global advice.detachedHead false

# Install pre-commit support
Expand Down
7 changes: 5 additions & 2 deletions modules/pre-commit/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@

.PHONY: pre-commit/run
.PHONY: pre-commit/run pre-commit/all

pre-commit/run:
pre-commit/all:
pre-commit run --all-files

pre-commit/run:
pre-commit run --hook-stage pre-push