From 877ca247e3a8131cb486c78986868853a5fe603a Mon Sep 17 00:00:00 2001 From: zhsj Date: Sat, 22 Apr 2023 17:53:03 +0800 Subject: [PATCH] .github/workflows: update ronn to 0.9 (#483) This fixes apostrophes in generated manpage. Apostrophes should be entered as `'` ; using `\'` produces an acute accent. ronn in Ubuntu is from https://github.com/apjanke/ronn-ng --- .github/workflows/ronn.yml | 6 +- .github/workflows/ronn/Dockerfile | 8 -- .github/workflows/ronn/Gemfile | 5 - .github/workflows/ronn/Gemfile.lock | 20 ---- .github/workflows/ronn/action.yml | 4 - doc/age-keygen.1 | 38 +------ doc/age-keygen.1.html | 35 +++--- doc/age.1 | 155 ++------------------------ doc/age.1.html | 163 +++++++++++++++++----------- 9 files changed, 140 insertions(+), 294 deletions(-) delete mode 100644 .github/workflows/ronn/Dockerfile delete mode 100644 .github/workflows/ronn/Gemfile delete mode 100644 .github/workflows/ronn/Gemfile.lock delete mode 100644 .github/workflows/ronn/action.yml diff --git a/.github/workflows/ronn.yml b/.github/workflows/ronn.yml index eb4f50c0..504a77b6 100644 --- a/.github/workflows/ronn.yml +++ b/.github/workflows/ronn.yml @@ -6,7 +6,6 @@ on: paths: - '**.ronn' - '**/ronn.yml' - - '**/ronn/**' permissions: contents: read jobs: @@ -16,9 +15,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + - name: Install ronn + run: sudo apt-get update && sudo apt-get install -y ronn - name: Run ronn - uses: ./.github/workflows/ronn - id: ronn + run: bash -O globstar -c 'ronn **/*.ronn' - name: Undo email mangling # rdiscount randomizes the output for no good reason, which causes # changes to always get committed. Sigh. diff --git a/.github/workflows/ronn/Dockerfile b/.github/workflows/ronn/Dockerfile deleted file mode 100644 index f373ec3b..00000000 --- a/.github/workflows/ronn/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM ruby:3.0.1-buster - -RUN apt-get update && apt-get install -y groff -RUN bundle config --global frozen 1 -COPY Gemfile Gemfile.lock ./ -RUN bundle install -ENTRYPOINT ["bash", "-O", "globstar", "-c", \ - "/usr/local/bundle/bin/ronn **/*.ronn"] diff --git a/.github/workflows/ronn/Gemfile b/.github/workflows/ronn/Gemfile deleted file mode 100644 index 544b2e3c..00000000 --- a/.github/workflows/ronn/Gemfile +++ /dev/null @@ -1,5 +0,0 @@ -# frozen_string_literal: true - -source "https://rubygems.org" - -gem "ronn", "~> 0.7.3" diff --git a/.github/workflows/ronn/Gemfile.lock b/.github/workflows/ronn/Gemfile.lock deleted file mode 100644 index 45c7cd56..00000000 --- a/.github/workflows/ronn/Gemfile.lock +++ /dev/null @@ -1,20 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - hpricot (0.8.6) - mustache (1.1.1) - rdiscount (2.2.0.2) - ronn (0.7.3) - hpricot (>= 0.8.2) - mustache (>= 0.7.0) - rdiscount (>= 1.5.8) - -PLATFORMS - aarch64-linux - x86_64-linux - -DEPENDENCIES - ronn (~> 0.7.3) - -BUNDLED WITH - 2.2.15 diff --git a/.github/workflows/ronn/action.yml b/.github/workflows/ronn/action.yml deleted file mode 100644 index 47344992..00000000 --- a/.github/workflows/ronn/action.yml +++ /dev/null @@ -1,4 +0,0 @@ -name: Ronn -runs: - using: docker - image: Dockerfile diff --git a/doc/age-keygen.1 b/doc/age-keygen.1 index 3aced705..65f65aaa 100644 --- a/doc/age-keygen.1 +++ b/doc/age-keygen.1 @@ -1,88 +1,56 @@ -.\" generated with Ronn/v0.7.3 -.\" http://github.com/rtomayko/ronn/tree/0.7.3 -. -.TH "AGE\-KEYGEN" "1" "September 2022" "" "" -. +.\" generated with Ronn-NG/v0.9.1 +.\" http://github.com/apjanke/ronn-ng/tree/0.9.1 +.TH "AGE\-KEYGEN" "1" "January 2023" "" .SH "NAME" \fBage\-keygen\fR \- generate age(1) key pairs -. .SH "SYNOPSIS" \fBage\-keygen\fR [\fB\-o\fR \fIOUTPUT\fR] -. .br \fBage\-keygen\fR \fB\-y\fR [\fB\-o\fR \fIOUTPUT\fR] [\fIINPUT\fR] -. .br -. .SH "DESCRIPTION" \fBage\-keygen\fR generates a new native age(1) key pair, and outputs the identity to standard output or to the \fIOUTPUT\fR file\. The output includes the public key and the current time as comments\. -. .P If the output is not going to a terminal, \fBage\-keygen\fR prints the public key to standard error\. -. .SH "OPTIONS" -. .TP \fB\-o\fR, \fB\-\-output\fR=\fIOUTPUT\fR Write the identity to \fIOUTPUT\fR instead of standard output\. -. .IP If \fIOUTPUT\fR already exists, it is not overwritten\. -. .TP \fB\-y\fR Read an identity file from \fIINPUT\fR or from standard input and output the corresponding recipient(s), one per line, with no comments\. -. .TP \fB\-\-version\fR Print the version and exit\. -. .SH "EXAMPLES" Generate a new identity: -. .IP "" 4 -. .nf - $ age\-keygen # created: 2021\-01\-02T15:30:45+01:00 # public key: age1lvyvwawkr0mcnnnncaghunadrqkmuf9e6507x9y920xxpp866cnql7dp2z AGE\-SECRET\-KEY\-1N9JEPW6DWJ0ZQUDX63F5A03GX8QUW7PXDE39N8UYF82VZ9PC8UFS3M7XA9 -. .fi -. .IP "" 0 -. .P Write a new identity to \fBkey\.txt\fR: -. .IP "" 4 -. .nf - $ age\-keygen \-o key\.txt Public key: age1ql3z7hjy54pw3hyww5ayyfg7zqgvc7w3j2elw8zmrj2kg5sfn9aqmcac8p -. .fi -. .IP "" 0 -. .P Convert an identity to a recipient: -. .IP "" 4 -. .nf - $ age\-keygen \-y key\.txt age1ql3z7hjy54pw3hyww5ayyfg7zqgvc7w3j2elw8zmrj2kg5sfn9aqmcac8p -. .fi -. .IP "" 0 -. .SH "SEE ALSO" age(1) -. .SH "AUTHORS" Filippo Valsorda \fIage@filippo\.io\fR diff --git a/doc/age-keygen.1.html b/doc/age-keygen.1.html index 167ca324..d0c69fd4 100644 --- a/doc/age-keygen.1.html +++ b/doc/age-keygen.1.html @@ -1,8 +1,8 @@ - - + + age-keygen(1) - generate age(1) key pairs