From 884b01bdf949dc04da2cc47a56c51d0b6d0973d9 Mon Sep 17 00:00:00 2001 From: erinmgraham Date: Tue, 27 May 2025 02:31:20 +0000 Subject: [PATCH 1/2] [actions] update sandpaper workflow to version 0.16.12 --- .github/workflows/README.md | 2 +- .github/workflows/sandpaper-version.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/README.md b/.github/workflows/README.md index 7076ddd9f6..18ab765095 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -43,7 +43,7 @@ This workflow does the following: #### Caching This workflow has two caches; one cache is for the lesson infrastructure and -the other is for the the lesson dependencies if the lesson contains rendered +the other is for the lesson dependencies if the lesson contains rendered content. These caches are invalidated by new versions of the infrastructure and the `renv.lock` file, respectively. If there is a problem with the cache, manual invaliation is necessary. You will need maintain access to the repository diff --git a/.github/workflows/sandpaper-version.txt b/.github/workflows/sandpaper-version.txt index ce62dc55bf..ea98690dce 100644 --- a/.github/workflows/sandpaper-version.txt +++ b/.github/workflows/sandpaper-version.txt @@ -1 +1 @@ -0.16.9 +0.16.12 From 26a210ed75cb408bec38b601092b6f6c6496436e Mon Sep 17 00:00:00 2001 From: Erin Graham Date: Tue, 24 Jun 2025 13:29:55 +1000 Subject: [PATCH 2/2] Restore SSH config guidance accidentally excluded from earlier merge --- episodes/07-github.md | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/episodes/07-github.md b/episodes/07-github.md index edb749f3ae..e21e7ecf1a 100644 --- a/episodes/07-github.md +++ b/episodes/07-github.md @@ -168,6 +168,36 @@ ls: cannot access '/c/Users/Alfredo/.ssh': No such file or directory If SSH has been set up on the computer you're using, the public and private key pairs will be listed. The file names are either `id_ed25519`/`id_ed25519.pub` or `id_rsa`/`id_rsa.pub` depending on how the key pairs were set up. Since they don't exist on Alfredo's computer, he uses this command to create them. +::::::::::::::::::::::::::::::::::::::::: spoiler + +## Resolving SSH Key Conflicts: Custom Names and Paths + +If you need to create an SSH key pair with a custom name or store it in a non-default location (e.g., because a default-named key like id_ed25519 already exists), Git may not automatically use it when pushing or pulling from GitHub. + +One solution is to add a GitHub entry to your SSH config. + +Open or create the SSH config file: + +```bash + +$ nano ~/.ssh/config +``` + +Add an entry for GitHub, replacing the path with your key’s actual name and location: + +``` +Host github.com + HostName github.com + User git + IdentityFile ~// + IdentitiesOnly yes +``` + +Save and exit. Now Git will use the correct key when pushing to GitHub. + +:::::::::::::::::::::::::::::::::::::::::::::::::: + + ### 3\.1 Create an SSH key pair To create an SSH key pair Alfredo uses this command, where the `-t` option specifies which type of algorithm to use and `-C` attaches a comment to the key (here, Alfredo's email):