diff --git a/.gitea/workflows/publish-aur-git.yml b/.gitea/workflows/publish-aur-git.yml index 98ee7a2..1078297 100644 --- a/.gitea/workflows/publish-aur-git.yml +++ b/.gitea/workflows/publish-aur-git.yml @@ -16,10 +16,10 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Setup Arch Linux environment + - name: Ensure publish tools are available run: | sudo apt-get update - sudo apt-get install -y pacman-package-manager curl jq || true + sudo apt-get install -y openssh-client git - name: Prepare AUR files run: | @@ -27,12 +27,23 @@ jobs: cp packaging/AUR/PKGBUILD.git aur-work/PKGBUILD cp packaging/AUR/.SRCINFO.git aur-work/.SRCINFO + - name: Setup SSH + run: | + mkdir -p ~/.ssh + printf '%s\n' "${{ secrets.AUR_SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa + chmod 600 ~/.ssh/id_rsa + ssh-keyscan -H aur.archlinux.org >> ~/.ssh/known_hosts + - name: Publish to AUR - uses: KSXGitHub/github-actions-deploy-aur@v3.0.1 - with: - pkgname: kewt-git - pkgbuild: ./aur-work/PKGBUILD - commit_username: ${{ github.actor }} - commit_email: ${{ github.actor }}@users.noreply.github.com - ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }} - commit_message: "Update kewt-git to ${{ github.sha }}" + run: | + rm -rf aur-repo + git clone "ssh://aur@aur.archlinux.org/kewt-git.git" aur-repo + cp aur-work/PKGBUILD aur-repo/PKGBUILD + cp aur-work/.SRCINFO aur-repo/.SRCINFO + + cd aur-repo + git config user.name "${{ github.actor }}" + git config user.email "${{ github.actor }}@users.noreply.github.com" + git add PKGBUILD .SRCINFO + git commit -m "Update kewt-git to ${GITHUB_SHA}" || exit 0 + GIT_SSH_COMMAND="ssh -i ~/.ssh/id_rsa -o IdentitiesOnly=yes -o StrictHostKeyChecking=yes" git push origin HEAD:master diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 5e3f868..6ad4707 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -75,7 +75,7 @@ jobs: - name: Setup Arch Linux environment run: | sudo apt-get update - sudo apt-get install -y pacman-package-manager curl jq || true + sudo apt-get install -y openssh-client curl jq - name: Render PKGBUILD and SRCINFO run: | @@ -95,15 +95,26 @@ jobs: -e "s/SHA256SUM_PLACEHOLDER/${CHECKSUM}/g" \ packaging/AUR/.SRCINFO.template > aur-work/.SRCINFO + - name: Setup AUR SSH + run: | + mkdir -p ~/.ssh + printf '%s\n' "${{ secrets.AUR_SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa + chmod 600 ~/.ssh/id_rsa + ssh-keyscan -H aur.archlinux.org >> ~/.ssh/known_hosts + - name: Publish to AUR - uses: KSXGitHub/github-actions-deploy-aur@v3.0.1 - with: - pkgname: kewt-bin - pkgbuild: ./aur-work/PKGBUILD - commit_username: ${{ github.actor }} - commit_email: ${{ github.actor }}@users.noreply.github.com - ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }} - commit_message: "Update kewt-bin to ${{ github.ref_name }}" + run: | + rm -rf aur-repo + git clone "ssh://aur@aur.archlinux.org/kewt-bin.git" aur-repo + cp aur-work/PKGBUILD aur-repo/PKGBUILD + cp aur-work/.SRCINFO aur-repo/.SRCINFO + + cd aur-repo + git config user.name "${{ github.actor }}" + git config user.email "${{ github.actor }}@users.noreply.github.com" + git add PKGBUILD .SRCINFO + git commit -m "Update kewt-bin to ${GITHUB_REF_NAME}" || exit 0 + GIT_SSH_COMMAND="ssh -i ~/.ssh/id_rsa -o IdentitiesOnly=yes -o StrictHostKeyChecking=yes" git push origin HEAD:master publish-homebrew: runs-on: local diff --git a/markdown.sh b/markdown.sh index 6adb61d..d75dbcb 100755 --- a/markdown.sh +++ b/markdown.sh @@ -62,7 +62,6 @@ awk -v custom_admonitions="$CUSTOM_ADMONITIONS" -f "$awk_dir/blockquote_to_admon awk -f "$awk_dir/fenced_code.awk" "$temp_file" > "$temp_file.tmp" && mv "$temp_file.tmp" "$temp_file" awk -f "$awk_dir/indented_code.awk" "$temp_file" > "$temp_file.tmp" && mv "$temp_file.tmp" "$temp_file" awk -f "$awk_dir/pipe_tables.awk" "$temp_file" > "$temp_file.tmp" && mv "$temp_file.tmp" "$temp_file" -awk -v enable_header_links="$ENABLE_HEADER_LINKS" -f "$awk_dir/headers.awk" "$temp_file" > "$temp_file.tmp" && mv "$temp_file.tmp" "$temp_file" awk -f "$awk_dir/definition_lists.awk" "$temp_file" > "$temp_file.tmp" && mv "$temp_file.tmp" "$temp_file" awk -f "$awk_dir/lists.awk" "$temp_file" > "$temp_file.tmp" && mv "$temp_file.tmp" "$temp_file" @@ -78,5 +77,6 @@ awk -f "$awk_dir/paragraphs.awk" "$temp_file" > "$temp_file.tmp" && mv "$temp_fi # Inline styles awk -v emoji_file="$awk_dir/emoji.tsv" -f "$awk_dir/emoji.awk" "$temp_file" > "$temp_file.tmp" && mv "$temp_file.tmp" "$temp_file" awk -f "$awk_dir/markdown_inline.awk" "$temp_file" > "$temp_file.tmp" && mv "$temp_file.tmp" "$temp_file" +awk -v enable_header_links="$ENABLE_HEADER_LINKS" -f "$awk_dir/headers.awk" "$temp_file" > "$temp_file.tmp" && mv "$temp_file.tmp" "$temp_file" awk -v input_file="$1" -v site_root="$MARKDOWN_SITE_ROOT" -v fallback_file="$MARKDOWN_FALLBACK_FILE" -v script_dir="$script_dir" -f "$awk_dir/markdown_embed.awk" "$temp_file" rm "$temp_file" diff --git a/styles/kewt.css b/styles/kewt.css index c871167..ecf1c86 100644 --- a/styles/kewt.css +++ b/styles/kewt.css @@ -145,14 +145,17 @@ h3 { } .header-link { - color: inherit; + color: var(--fg); display: inline; + text-decoration: underline; + text-decoration-color: var(--fg-muted); } .header-link:hover, .header-link:focus { - background: transparent; - color: inherit; + background: var(--fg); + color: var(--bg); + text-decoration-color: var(--fg); } .header-anchor {