Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into 312-feature-remove-…
Browse files Browse the repository at this point in the history
…unnecessary-modifications-to-mavros-and-source-build
  • Loading branch information
amarburg committed Dec 13, 2024
2 parents 8da22ed + ab705d2 commit 9b647b0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@ jobs:

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
# Pin docker-buildx to this version for now
# v0.19.2 has issues with empty keys,
# particularly the "*.cache-to=" used below
#
version: v0.18.0

- if: env.PUSH == 'true'
name: Log into registry
Expand Down
7 changes: 3 additions & 4 deletions docs/package-lock.json

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

0 comments on commit 9b647b0

Please sign in to comment.