Skip to content

Commit

Permalink
Merge branch 'master' into snyk-fix-09f45f03a085f0f7559d6915d3e9158e
Browse files Browse the repository at this point in the history
  • Loading branch information
rbonghi authored Dec 7, 2023
2 parents 52b3e88 + 1d8d84e commit 5d2d959
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/build-and-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

steps:
- run: echo "Branch $GITHUB_REF"
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
# https://github.com/docker/build-push-action/blob/master/docs/advanced/tags-labels.md
- name: Docker meta
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
# https://github.com/docker/metadata-action/issues/123
github-token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -63,9 +63,9 @@ jobs:
type=ref,event=tag
type=ref,event=pr
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
if: |
github.actor != 'dependabot[bot]' &&
Expand All @@ -79,7 +79,7 @@ jobs:
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push
id: docker_build
uses: docker/build-push-action@v4.2.1
uses: docker/build-push-action@v5.1.0
with:
push: |
${{ github.actor != 'dependabot[bot]' &&
Expand All @@ -97,7 +97,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
persist-credentials: false
- name: Build sphinx
Expand Down Expand Up @@ -136,7 +136,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Docker Hub Description # https://github.com/peter-evans/dockerhub-description
uses: peter-evans/dockerhub-description@v3
with:
Expand All @@ -152,7 +152,7 @@ jobs:
if: startsWith(github.ref, 'refs/tags/')
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ sphinx-autobuild
sphinxext-opengraph
numpy>=1.22.2 # not directly required, pinned by Snyk to avoid a vulnerability
tornado>=6.3.3 # not directly required, pinned by Snyk to avoid a vulnerability
pillow>=10.0.0 # not directly required, pinned by Snyk to avoid a vulnerability
pillow>=10.0.0 # not directly required, pinned by Snyk to avoid a vulnerability

0 comments on commit 5d2d959

Please sign in to comment.