Skip to content
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.

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

Dependency updates #698

Merged
merged 6 commits into from
Dec 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
- stable
- beta
- # MSRV
1.60.0
1.67.0
target:
- ""
continue-on-error:
Expand Down
38 changes: 19 additions & 19 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,27 @@ jobs:
id: buildx
uses: docker/setup-buildx-action@v1

- name: Setup connection to arm64-capable runner
run: |
echo "::group::ssh-agent: launch and export"
eval "$(ssh-agent)"
echo "SSH_AUTH_SOCK=$SSH_AUTH_SOCK" >> $GITHUB_ENV
echo "SSH_AGENT_PID=$SSH_AGENT_PID" >> $GITHUB_ENV
echo "::endgroup::"
# - name: Setup connection to arm64-capable runner
# run: |
# echo "::group::ssh-agent: launch and export"
# eval "$(ssh-agent)"
# echo "SSH_AUTH_SOCK=$SSH_AUTH_SOCK" >> $GITHUB_ENV
# echo "SSH_AGENT_PID=$SSH_AGENT_PID" >> $GITHUB_ENV
# echo "::endgroup::"

echo "::group::ssh-agent: load private key"
ssh-add - <<< "${{ secrets.ARMRUNNER1_SSH_PRIVATE_KEY }}"
echo "::endgroup::"
# echo "::group::ssh-agent: load private key"
# ssh-add - <<< "${{ secrets.ARMRUNNER1_SSH_PRIVATE_KEY }}"
# echo "::endgroup::"

echo "::group::ssh: pin runner public key"
mkdir ~/.ssh && chmod 0700 ~/.ssh || :
echo "[${{ secrets.ARMRUNNER1_HOSTNAME }}]:${{ secrets.ARMRUNNER1_SSH_PORT }} ${{ secrets.ARMRUNNER1_SSH_HOSTKEY }}" > ~/.ssh/known_hosts
echo "::endgroup::"
# echo "::group::ssh: pin runner public key"
# mkdir ~/.ssh && chmod 0700 ~/.ssh || :
# echo "[${{ secrets.ARMRUNNER1_HOSTNAME }}]:${{ secrets.ARMRUNNER1_SSH_PORT }} ${{ secrets.ARMRUNNER1_SSH_HOSTKEY }}" > ~/.ssh/known_hosts
# echo "::endgroup::"

- name: Register arm64-capable runner with Buildx
env:
DOCKER_HOST: ssh://github-actions@${{ secrets.ARMRUNNER1_HOSTNAME }}:${{ secrets.ARMRUNNER1_SSH_PORT }}
run: docker buildx create --append --name ${{ steps.buildx.outputs.name }} --bootstrap
# - name: Register arm64-capable runner with Buildx
# env:
# DOCKER_HOST: ssh://github-actions@${{ secrets.ARMRUNNER1_HOSTNAME }}:${{ secrets.ARMRUNNER1_SSH_PORT }}
# run: docker buildx create --append --name ${{ steps.buildx.outputs.name }} --bootstrap

- name: Checkout
uses: actions/checkout@v2
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
uses: docker/build-push-action@v2
with:
context: .
platforms: linux/amd64,linux/arm64,linux/arm/v7
platforms: linux/amd64 # ,linux/arm64,linux/arm/v7
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
[shiplift]: https://github.com/softprops/shiplift
[bollard]: https://github.com/fussybeaver/bollard

* Bump minimum supported Rust version to 1.60.0 (from 1.46.0).
* Bump minimum supported Rust version to 1.67.0 (from 1.46.0).

(Required after updating dependencies.)

Expand Down
Loading
Loading