Skip to content

Commit fdd5115

Browse files
joskeclaude
andauthored
Fix/aur ssh and bump to 0.4.6 (#20)
* Fix AUR SSH setup: use ssh-keyscan and unindented config The heredoc was indented with the YAML, producing leading spaces in ~/.ssh/config which SSH silently ignores. Use ssh-keyscan for host key verification and printf for the config to avoid whitespace issues. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * bump to 0.4.6 * rename workflow * Remove push trigger from audit workflow to avoid duplicate runs The push and pull_request triggers both fire on PR branches, causing the audit to run twice. The pull_request trigger alone is sufficient. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 50dfe0f commit fdd5115

4 files changed

Lines changed: 5 additions & 12 deletions

File tree

.github/workflows/audit.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
name: Security Audit
22
on:
3-
push:
4-
paths:
5-
- Cargo.lock
63
pull_request:
74
paths:
85
- Cargo.lock

.github/workflows/publish.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Publish to crates.io
1+
name: Release
22
on:
33
workflow_dispatch:
44
jobs:
@@ -250,12 +250,8 @@ jobs:
250250
mkdir -p ~/.ssh
251251
echo "$AUR_SSH_KEY" > ~/.ssh/aur
252252
chmod 600 ~/.ssh/aur
253-
cat >> ~/.ssh/config <<EOC
254-
Host aur.archlinux.org
255-
IdentityFile ~/.ssh/aur
256-
User aur
257-
StrictHostKeyChecking accept-new
258-
EOC
253+
ssh-keyscan aur.archlinux.org >> ~/.ssh/known_hosts
254+
printf 'Host aur.archlinux.org\n IdentityFile ~/.ssh/aur\n User aur\n' >> ~/.ssh/config
259255
- name: Clone AUR repo
260256
run: git clone ssh://aur@aur.archlinux.org/mergers.git aur-repo
261257
- name: Update PKGBUILD

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "mergers"
3-
version = "0.4.5"
3+
version = "0.4.6"
44
edition = "2024"
55
description = "A visual diff and merge tool for files and directories"
66
license = "GPL-2.0"

0 commit comments

Comments
 (0)