Skip to content

fix(ci): unify import of SSH key #58

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
abonander merged 1 commit into from
May 13, 2025
Merged

fix(ci): unify import of SSH key #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 32 additions & 19 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,12 @@ jobs:
- name: Add TCE Deploy Key
run: |
mkdir -p ~/.ssh
echo '${{ secrets.TASHIBOT_SSH_KEY }}' >> ~/.ssh/id_ed25519
chmod 400 ~/.ssh/id_ed25519
ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
eval $(ssh-agent -s)
ssh-add - <<< "${{ secrets.TASHIBOT_SSH_KEY }}"
echo "SSH_AUTH_SOCK=$SSH_AUTH_SOCK" >> $GITHUB_ENV
ssh-keyscan github.com >> ~/.ssh/known_hosts

bash docker-util/test-ssh.sh

- name: Rust cache
uses: Swatinem/rust-cache@v2
Expand Down Expand Up @@ -84,9 +87,12 @@ jobs:
- name: Add TCE Deploy Key
run: |
mkdir -p ~/.ssh
echo '${{ secrets.TASHIBOT_SSH_KEY }}' >> ~/.ssh/id_ed25519
chmod 400 ~/.ssh/id_ed25519
ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
eval $(ssh-agent -s)
ssh-add - <<< "${{ secrets.TASHIBOT_SSH_KEY }}"
echo "SSH_AUTH_SOCK=$SSH_AUTH_SOCK" >> $GITHUB_ENV
ssh-keyscan github.com >> ~/.ssh/known_hosts

bash docker-util/test-ssh.sh

- name: Rust cache
uses: Swatinem/rust-cache@v2
Expand Down Expand Up @@ -119,6 +125,9 @@ jobs:
eval $(ssh-agent -s)
ssh-add - <<< "${{ secrets.TASHIBOT_SSH_KEY }}"
echo "SSH_AUTH_SOCK=$SSH_AUTH_SOCK" >> $GITHUB_ENV
ssh-keyscan github.com >> ~/.ssh/known_hosts

bash ../docker-util/test-ssh.sh

- name: Build and run the message queue brokers
run: docker compose up --build -d
Expand Down Expand Up @@ -179,19 +188,17 @@ jobs:
needs: tmq-check
runs-on: ghcr.io/cirruslabs/macos-runner:sonoma
timeout-minutes: 30
env:
GIT_SSH_COMMAND: ssh -i .ssh/id_ed25519
steps:
- name: Check out
uses: actions/checkout@v4

- name: Add TCE Deploy Key
run: |
eval "$(ssh-agent -s)"
mkdir -p .ssh
echo '${{ secrets.TASHIBOT_SSH_KEY }}' >> .ssh/id_ed25519
chmod 400 .ssh/id_ed25519
ssh-add .ssh/id_ed25519
mkdir -p ~/.ssh
eval $(ssh-agent -s)
ssh-add - <<< "${{ secrets.TASHIBOT_SSH_KEY }}"
echo "SSH_AUTH_SOCK=$SSH_AUTH_SOCK" >> $GITHUB_ENV
ssh-keyscan github.com >> ~/.ssh/known_hosts

bash docker-util/test-ssh.sh

Expand Down Expand Up @@ -292,9 +299,12 @@ jobs:
- name: Add TCE Deploy Key
run: |
mkdir -p ~/.ssh
echo '${{ secrets.TASHIBOT_SSH_KEY }}' >> ~/.ssh/id_ed25519
chmod 400 ~/.ssh/id_ed25519
ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
eval $(ssh-agent -s)
ssh-add - <<< "${{ secrets.TASHIBOT_SSH_KEY }}"
echo "SSH_AUTH_SOCK=$SSH_AUTH_SOCK" >> $GITHUB_ENV
ssh-keyscan github.com >> ~/.ssh/known_hosts

bash docker-util/test-ssh.sh

- name: Rust cache
uses: Swatinem/rust-cache@v2
Expand Down Expand Up @@ -345,9 +355,12 @@ jobs:
- name: Add TCE Deploy Key
run: |
mkdir -p ~/.ssh
echo '${{ secrets.TASHIBOT_SSH_KEY }}' >> ~/.ssh/id_ed25519
chmod 400 ~/.ssh/id_ed25519
ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
eval $(ssh-agent -s)
ssh-add - <<< "${{ secrets.TASHIBOT_SSH_KEY }}"
echo "SSH_AUTH_SOCK=$SSH_AUTH_SOCK" >> $GITHUB_ENV
ssh-keyscan github.com >> ~/.ssh/known_hosts

bash tmq/docker-util/test-ssh.sh

- name: Check out
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion docker-util/test-ssh.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# Docker has this annoying behavior where if you don't pass `--ssh`, it'll set the environment variable,
# but not actually mount the socket, and everything that depends on this fails silently as well! Very fun.
if [[ ! -S $SSH_AUTH_SOCK ]]; then
echo 'Error: Docker build command must be run with `--ssh default` to use ssh mounts.'
echo 'Error: $SSH_AUTH_SOCK does not exist. If building in Docker, build command must be run with `--ssh default` to use ssh mounts.'
exit 1
fi

Expand Down
Loading