From b1e1c0fd1019baac5a0278b274d4348d167ecd53 Mon Sep 17 00:00:00 2001 From: Nuru Date: Sat, 22 Jul 2023 20:17:56 -0700 Subject: [PATCH] Update dependencies that were breaking builds (#355) * Update pre-commit recipies * Update Python package versions * Update Docker GitHub actions to current --- .github/workflows/docker.yml | 10 +++++----- Dockerfile | 10 +++++----- modules/pre-commit/Makefile | 7 +++++-- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 3596369b..eb9cb55c 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -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 @@ -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' }} diff --git a/Dockerfile b/Dockerfile index eb813139..7f8e3f25 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/modules/pre-commit/Makefile b/modules/pre-commit/Makefile index 891b6b25..421c60f4 100644 --- a/modules/pre-commit/Makefile +++ b/modules/pre-commit/Makefile @@ -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