Skip to content

Sync main / develop #357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ptr727 merged 3 commits into from
Mar 31, 2026
Merged

Sync main / develop #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da6fa6b
Develop (#356)
ptr727 Mar 31, 2026
a775275
Bump the actions-deps group across 1 directory with 4 updates (#349)
dependabot[bot] Mar 31, 2026
2c1e678
Merge branch 'develop' into main
ptr727 Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build-base-images-task.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,24 @@ jobs:
uses: actions/checkout@v6

- name: Setup QEMU step
uses: docker/setup-qemu-action@v3
uses: docker/setup-qemu-action@v4
with:
platforms: linux/amd64,linux/arm64

- name: Setup Buildx step
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v4
with:
platforms: linux/amd64,linux/arm64

- name: Login to Docker Hub step
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
registry: docker.io
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}

- name: Docker build and push base step
uses: docker/build-push-action@v6
uses: docker/build-push-action@v7
with:
push: ${{ inputs.push && (github.ref_name == 'main' || github.ref_name == 'develop') }}
context: Docker
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-docker-task.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,17 @@ jobs:
uses: actions/checkout@v6

- name: Setup QEMU step
uses: docker/setup-qemu-action@v3
uses: docker/setup-qemu-action@v4
with:
platforms: linux/amd64,linux/arm64

- name: Setup Buildx step
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v4
with:
platforms: linux/amd64,linux/arm64

- name: Login to Docker Hub step
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
registry: docker.io
username: ${{ secrets.DOCKER_HUB_USERNAME }}
Expand All @@ -87,7 +87,7 @@ jobs:
} >> "$GITHUB_OUTPUT"

- name: Docker build and push step
uses: docker/build-push-action@v6
uses: docker/build-push-action@v7
with:
push: ${{ inputs.push && (github.ref_name == matrix.images.Branch) }}
context: Docker
Expand Down
Loading