resolve merge conflicts

This commit is contained in:
Jonatan Czarniecki 2025-06-08 18:05:52 +02:00
commit 5c3be679e2
No known key found for this signature in database
GPG key ID: 8B5FB251A803BDD0
4 changed files with 87 additions and 94 deletions

View file

@ -92,8 +92,8 @@ jobs:
# username: ${{ github.repository_owner }}
# password: ${{ secrets.GITHUB_TOKEN }}
# - name: Set up QEMU
# uses: docker/setup-qemu-action@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up buildx
uses: docker/setup-buildx-action@v3
@ -106,7 +106,9 @@ jobs:
build-args: |
ALPINE_VERSION
RUST_VERSION
platforms: linux/amd64,linux/arm64
platforms: |
linux/amd64
linux/arm64
# push: true
tags: |
ghcr.io/${{ github.repository_owner }}/sculptor:latest