Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	entity/Cargo.toml
#	migration/Cargo.toml
  • Loading branch information
friedemannsommer committed Oct 29, 2024
2 parents 574e399 + 0d12f8e commit d8ded45
Show file tree
Hide file tree
Showing 2 changed files with 105 additions and 79 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ jobs:
- name: Set up QEMU
uses: docker/[email protected]
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3.6.1
uses: docker/setup-buildx-action@v3.7.1
- name: Log in to the Container registry
uses: docker/[email protected]
with:
Expand All @@ -189,7 +189,7 @@ jobs:
run: |
cp -r "${{ steps.download.outputs.download-path }}" ./packaging/docker
- name: Build and push Docker image
uses: docker/build-push-action@v6.5.0
uses: docker/build-push-action@v6.9.0
with:
context: packaging/docker
platforms: linux/arm64,linux/arm/v6,linux/arm/v7,linux/amd64,linux/386
Expand Down
Loading

0 comments on commit d8ded45

Please sign in to comment.