Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/pip/boto3-1.28.44
Browse files Browse the repository at this point in the history
  • Loading branch information
MatteoVoges committed Sep 18, 2023
2 parents 540734b + 483c7a5 commit a2e1e3c
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 16 deletions.
3 changes: 1 addition & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ updates:
schedule:
interval: "weekly"
commit-message:
prefix: "PIP dependency update"
prefix: "chore: "
ignore:
- dependency-name: "google-api-python-client"
labels:
- "pip"
- "dependencies"
open-pull-requests-limit: 2
reviewers:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ on:
paths:
- 'docs/**'
- 'requirements.docs.txt'
- 'Dockerfile.docs'
- 'mkdocs.yml'
- 'CNAME'

Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/test-build-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ on:
- 'requirements.docs.txt'
- 'mkdocs.yml'
- 'CNAME'
- 'Dockerfile.docs'

release:
types: [created]
Expand All @@ -27,6 +28,7 @@ on:
- 'requirements.docs.txt'
- 'mkdocs.yml'
- 'CNAME'
- 'Dockerfile.docs'

jobs:
lint:
Expand Down Expand Up @@ -96,7 +98,7 @@ jobs:
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

# Builds docker image and allow scoped caching
- name: build Kapitan Image
Expand Down Expand Up @@ -138,7 +140,7 @@ jobs:
- name: Set up QEMU
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
uses: docker/login-action@v3
Expand All @@ -151,7 +153,7 @@ jobs:

- name: Docker meta
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
env:
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME}}
with:
Expand Down Expand Up @@ -194,7 +196,7 @@ jobs:
- name: Set up QEMU
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
uses: docker/login-action@v3
Expand All @@ -207,7 +209,7 @@ jobs:

- name: Docker meta
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
env:
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME}}
with:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.docs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM squidfunk/mkdocs-material:8.5.10
FROM squidfunk/mkdocs-material:9.3

COPY requirements.docs.txt /tmp/requirements.docs.txt

Expand Down
6 changes: 3 additions & 3 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions requirements.docs.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
markdown-include==0.7.0
mkdocs-material-extensions==1.1
mkdocs-material==8.5.10
mkdocs==1.4.2
pymdown-extensions==10.0
markdown-include==0.8.1
mkdocs-material-extensions==1.1.1
mkdocs-material==9.3.1
mkdocs==1.5.2
pymdown-extensions==10.3

0 comments on commit a2e1e3c

Please sign in to comment.