Merge branch 'master' into test-apk-and-arch

.ci/docker-ci/alpine/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.16.3
+FROM alpine:3.17.2
 
 LABEL maintainer="mail@sobolevn.me"
 LABEL vendor="git-secret team"

.ci/docker-ci/debian-gnupg1/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:11.5-slim
+FROM debian:11.6-slim
 
 LABEL maintainer="mail@sobolevn.me"
 LABEL vendor="git-secret team"

.ci/docker-ci/debian-gnupg2/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:11.5-slim
+FROM debian:11.6-slim
 
 LABEL maintainer="mail@sobolevn.me"
 LABEL vendor="git-secret team"

.ci/docker-ci/fedora/Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:36
+FROM fedora:37
 
 LABEL maintainer="mail@sobolevn.me"
 LABEL vendor="git-secret team"

.ci/docker-ci/ubuntu/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.04
 
 LABEL maintainer="mail@sobolevn.me"
 LABEL vendor="git-secret team"

.ci/release-ci/alpine/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.16.3
+FROM alpine:3.17.2
 
 LABEL maintainer="mail@sobolevn.me"
 LABEL vendor="git-secret team"

.ci/release-ci/debian/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:11.5-slim
+FROM debian:11.6-slim
 
 LABEL maintainer="mail@sobolevn.me"
 LABEL vendor="git-secret team"

.ci/release-ci/fedora/Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:36
+FROM fedora:37
 
 LABEL maintainer="mail@sobolevn.me"
 LABEL vendor="git-secret team"

.ci/release-ci/ubuntu/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.04
 
 LABEL maintainer="mail@sobolevn.me"
 LABEL vendor="git-secret team"

.ci/releaser/alpine/Dockerfile

@@ -1,6 +1,6 @@
 # Initially copied from
 # https://github.com/jordansissel/fpm/blob/master/Dockerfile
-FROM alpine:3.16.3
+FROM alpine:3.17.2
 
 SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
 

.github/workflows/test.yml

@@ -71,8 +71,8 @@ jobs:
   windows-wsl-ci:
     runs-on: windows-latest
     steps:
-    - uses: Vampire/setup-wsl@v1
+    - uses: Vampire/setup-wsl@v2
-      with:
+      with: 
         update: 'true'
         additional-packages: gnupg make man git gawk file
     - run: git config --global core.autocrlf input

docs/Gemfile.lock

@@ -11,10 +11,11 @@ GEM
     eventmachine (1.2.7)
     ffi (1.15.5)
     forwardable-extended (2.6.0)
+    google-protobuf (3.21.12-x86_64-linux)
     http_parser.rb (0.8.0)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    jekyll (4.3.1)
+    jekyll (4.3.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -30,8 +31,8 @@ GEM
       safe_yaml (~> 1.0)
       terminal-table (>= 1.8, < 4.0)
       webrick (~> 1.7)
-    jekyll-sass-converter (2.2.0)
+    jekyll-sass-converter (3.0.0)
-      sassc (> 2.0.1, < 3.0)
+      sass-embedded (~> 1.54)
     jekyll-seo-tag (2.8.0)
       jekyll (>= 3.8, < 5.0)
     jekyll-watch (2.2.1)
@@ -40,25 +41,29 @@ GEM
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liquid (4.0.3)
+    liquid (4.0.4)
-    listen (3.7.1)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (5.0.0)
+    public_suffix (5.0.1)
+    rake (13.0.6)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.5)
-    rouge (4.0.0)
+    rouge (4.0.1)
     safe_yaml (1.0.5)
-    sassc (2.4.0)
+    sass-embedded (1.57.1)
-      ffi (~> 1.9)
+      google-protobuf (~> 3.21)
+      rake (>= 10.0.0)
+    sass-embedded (1.57.1-x86_64-linux-gnu)
+      google-protobuf (~> 3.21)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.4.2)
     webrick (1.7.0)
 
 PLATFORMS

man/man1/git-secret-changes.1

@@ -30,7 +30,7 @@ Note also this command can be affected by the \fBSECRETS_PINENTRY\fR environment
 .
 .nf
 
-\-d  \- specifies `\-\-homedir` option for the `gpg`\. Use this option if your store your keys in a custom location\.
+\-d  \- specifies `\-\-homedir` option for the `gpg`\. Use this option if you store your keys in a custom location\.
 \-p  \- specifies password for noinput mode, adds `\-\-passphrase` option for `gpg`\.
 \-h  \- shows help\.
 .

man/man1/git-secret-changes.1.md

@@ -21,7 +21,7 @@ Note also this command can be affected by the `SECRETS_PINENTRY` environment var
 
 ## OPTIONS
 
-    -d  - specifies `--homedir` option for the `gpg`. Use this option if your store your keys in a custom location.
+    -d  - specifies `--homedir` option for the `gpg`. Use this option if you store your keys in a custom location.
     -p  - specifies password for noinput mode, adds `--passphrase` option for `gpg`.
     -h  - shows help.