Release 2.6.12

This reverts commit 3cd0f0ed94.

.github/.cspell/organization-dictionary.txt

@@ -138,8 +138,11 @@ binutils
 connrefused
 cygwin
 dpkg
+elif
 endianness
+esac
 euxo
+gsub
 msys
 noninteractive
 noprofile

.github/workflows/release.yml

@@ -21,10 +21,11 @@ jobs:
       contents: write
     steps:
       - uses: actions/checkout@v3
+        with:
+          persist-credentials: false
       - uses: taiki-e/create-gh-release-action@v1
         with:
           changelog: CHANGELOG.md
           title: $version
           branch: 'main|v[0-9]+'
           token: ${{ secrets.GITHUB_TOKEN }}
-      - run: ci/publish.sh

CHANGELOG.md

@@ -10,6 +10,10 @@ Note: In this file, do not use the hard wrap in the middle of a sentence for com
 
 ## [Unreleased]
 
+## [2.6.12] - 2023-04-12
+
+- Update `cargo-deny@latest` to 0.13.9.
+
 ## [2.6.11] - 2023-04-11
 
 - Update `dprint@latest` to 0.35.4.
@@ -723,7 +727,8 @@ Note: This release is considered a breaking change because installing on version
 
 Initial release
 
-[Unreleased]: https://github.com/taiki-e/install-action/compare/v2.6.11...HEAD
+[Unreleased]: https://github.com/taiki-e/install-action/compare/v2.6.12...HEAD
+[2.6.12]: https://github.com/taiki-e/install-action/compare/v2.6.11...v2.6.12
 [2.6.11]: https://github.com/taiki-e/install-action/compare/v2.6.10...v2.6.11
 [2.6.10]: https://github.com/taiki-e/install-action/compare/v2.6.9...v2.6.10
 [2.6.9]: https://github.com/taiki-e/install-action/compare/v2.6.8...v2.6.9

ci/manifest.sh

@@ -3,15 +3,6 @@ set -euxo pipefail
 IFS=$'\n\t'
 cd "$(dirname "$0")"/..
 
-bail() {
-    echo >&2 "error: $*"
-    exit 1
-}
-
-if [[ -z "${CI:-}" ]]; then
-    bail "this script is intended to call from release workflow on CI"
-fi
-
 git config user.name "Taiki Endo"
 git config user.email "te316e89@gmail.com"
 

ci/publish.sh

@@ -1,74 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-cd "$(dirname "$0")"/..
-
-# shellcheck disable=SC2154
-trap 's=$?; echo >&2 "$0: Error on line "${LINENO}": ${BASH_COMMAND}"; exit ${s}' ERR
-
-bail() {
-    echo >&2 "error: $*"
-    exit 1
-}
-
-if [[ -z "${CI:-}" ]]; then
-    bail "this script is intended to call from release workflow on CI"
-fi
-ref="${GITHUB_REF:-}"
-if [[ "${ref}" != "refs/tags/"* ]]; then
-    bail "tag ref should start with 'refs/tags/'"
-fi
-tag="${ref#refs/tags/}"
-
-git config user.name "Taiki Endo"
-git config user.email "te316e89@gmail.com"
-
-version="${tag}"
-version="${version#v}"
-
-tools=()
-for tool in tools/codegen/base/*.json; do
-    tools+=("$(basename "${tool%.*}")")
-done
-# Aliases
-tools+=(nextest)
-# Not manifest-base
-tools+=(valgrind)
-
-(
-    set -x
-
-    major_version_tag="v${version%%.*}"
-    git checkout -b "${major_version_tag}"
-    git push origin refs/heads/"${major_version_tag}"
-    if git --no-pager tag | grep -Eq "^${major_version_tag}$"; then
-        git tag -d "${major_version_tag}"
-        git push --delete origin refs/tags/"${major_version_tag}"
-    fi
-    git tag "${major_version_tag}"
-    git checkout main
-    git branch -d "${major_version_tag}"
-)
-
-for tool in "${tools[@]}"; do
-    (
-        set -x
-        git checkout -b "${tool}"
-        sed -i -e "s/required: true/required: false/g" action.yml
-        sed -i -e "s/# default: #publish:tool/default: ${tool}/g" action.yml
-        git add action.yml
-        git commit -m "${tool}"
-        git push origin -f refs/heads/"${tool}"
-        if git --no-pager tag | grep -Eq "^${tool}$"; then
-            git tag -d "${tool}"
-            git push --delete origin refs/tags/"${tool}"
-        fi
-        git tag "${tool}"
-        git checkout main
-        git branch -D "${tool}"
-    )
-done
-
-set -x
-
-git push origin --tags

manifests/cargo-deny.json

@@ -18,10 +18,24 @@
     }
   },
   "latest": {
-    "version": "0.13.8"
+    "version": "0.13.9"
   },
   "0.13": {
-    "version": "0.13.8"
+    "version": "0.13.9"
+  },
+  "0.13.9": {
+    "x86_64_linux_musl": {
+      "checksum": "77f6b3feab12afc82638cd4c6197c983d249d1afa4180a6b9c933efbf8bff427"
+    },
+    "x86_64_macos": {
+      "checksum": "7b790f7e15dc6bb79dc0a737310f62fc7a4653749e40ec4fa7419ee627a014ed"
+    },
+    "x86_64_windows": {
+      "checksum": "6f6a69d1dbabf98a1d826dd2dbc0bbfd378336ec891b3e7fd8c570744ea6efa3"
+    },
+    "aarch64_macos": {
+      "checksum": "7d4cc49030262296c96076519deefc740e70fbc338ccd9179d4bc9d3be373512"
+    }
   },
   "0.13.8": {
     "x86_64_linux_musl": {

tools/publish.sh

@@ -14,14 +14,6 @@ trap 's=$?; echo >&2 "$0: Error on line "${LINENO}": ${BASH_COMMAND}"; exit ${s}
 # Note: This script requires the following tools:
 # - parse-changelog <https://github.com/taiki-e/parse-changelog>
 
-x() {
-    local cmd="$1"
-    shift
-    (
-        set -x
-        "${cmd}" "$@"
-    )
-}
 bail() {
     echo >&2 "error: $*"
     exit 1
@@ -48,7 +40,6 @@ if gh release view "${tag}" &>/dev/null; then
     bail "tag '${tag}' has already been created and pushed"
 fi
 
-# Make sure that the release was created from an allowed branch.
 if ! git branch | grep -q '\* main$'; then
     bail "current branch is not 'main'"
 fi
@@ -97,11 +88,57 @@ echo "======================================="
 
 if [[ -n "${tags}" ]]; then
     # Create a release commit.
-    x git add "${changelog}"
-    x git commit -m "Release ${version}"
+    git add "${changelog}"
+    git commit -m "Release ${version}"
 fi
 
-x git tag "${tag}"
-# TODO: the following still assumes admin permissions
-x git push origin main
-x git push origin --tags
+tools=()
+for tool in tools/codegen/base/*.json; do
+    tools+=("$(basename "${tool%.*}")")
+done
+# Aliases
+tools+=(nextest)
+# Not manifest-base
+tools+=(valgrind)
+
+(
+    set -x
+
+    git tag "${tag}"
+    git push origin main
+    git push origin --tags
+
+    major_version_tag="v${version%%.*}"
+    git checkout -b "${major_version_tag}"
+    git push origin refs/heads/"${major_version_tag}"
+    if git --no-pager tag | grep -Eq "^${major_version_tag}$"; then
+        git tag -d "${major_version_tag}"
+        git push --delete origin refs/tags/"${major_version_tag}"
+    fi
+    git tag "${major_version_tag}"
+    git checkout main
+    git branch -d "${major_version_tag}"
+)
+
+for tool in "${tools[@]}"; do
+    (
+        set -x
+        git checkout -b "${tool}"
+        sed -i -e "s/required: true/required: false/g" action.yml
+        sed -i -e "s/# default: #publish:tool/default: ${tool}/g" action.yml
+        git add action.yml
+        git commit -m "${tool}"
+        git push origin -f refs/heads/"${tool}"
+        if git --no-pager tag | grep -Eq "^${tool}$"; then
+            git tag -d "${tool}"
+            git push --delete origin refs/tags/"${tool}"
+        fi
+        git tag "${tool}"
+        git checkout main
+        git branch -D "${tool}"
+    )
+done
+
+set -x
+
+git push origin --tags

tools/tidy.sh

@@ -64,6 +64,7 @@ fi
 
 # Rust (if exists)
 if [[ -n "$(git ls-files '*.rs')" ]]; then
+    info "checking Rust code style"
     if type -P rustup &>/dev/null; then
         # `cargo fmt` cannot recognize files not included in the current workspace and modules
         # defined inside macros, so run rustfmt directly.
@@ -87,10 +88,35 @@ if [[ -n "$(git ls-files '*.rs')" ]]; then
         error "please replace \`.cast()\` with \`.cast::<type_name>()\`:"
         echo "${cast_without_turbofish}"
     fi
+    first='1'
+    for readme in $(git ls-files '*README.md'); do
+        if ! grep -q '^<!-- tidy:crate-doc:start -->' "${readme}"; then
+            continue
+        fi
+        lib="$(dirname "${readme}")/src/lib.rs"
+        if [[ -n "${first}" ]]; then
+            first=''
+            info "checking readme and crate-level doc are synchronized"
+        fi
+        if ! grep -q '^<!-- tidy:crate-doc:end -->' "${readme}"; then
+            bail "missing '<!-- tidy:crate-doc:end -->' comment in ${readme}"
+        fi
+        if ! grep -q '^<!-- tidy:crate-doc:start -->' "${lib}"; then
+            bail "missing '<!-- tidy:crate-doc:start -->' comment in ${lib}"
+        fi
+        if ! grep -q '^<!-- tidy:crate-doc:end -->' "${lib}"; then
+            bail "missing '<!-- tidy:crate-doc:end -->' comment in ${lib}"
+        fi
+        new=$(tr <"${readme}" '\n' '\a' | grep -o '<!-- tidy:crate-doc:start -->.*<!-- tidy:crate-doc:end -->' | sed 's/\&/\\\&/g; s/\\/\\\\/g')
+        new=$(tr <"${lib}" '\n' '\a' | awk -v new="${new}" 'gsub("<!-- tidy:crate-doc:start -->.*<!-- tidy:crate-doc:end -->",new)' | tr '\a' '\n')
+        echo "${new}" >"${lib}"
+        check_diff "${lib}"
+    done
 fi
 
 # C/C++ (if exists)
 if [[ -n "$(git ls-files '*.c')$(git ls-files '*.cpp')" ]]; then
+    info "checking C/C++ code style"
     if [[ ! -e .clang-format ]]; then
         warn "could not fount .clang-format in the repository root"
     fi
@@ -105,6 +131,7 @@ fi
 
 # YAML/JavaScript/JSON (if exists)
 if [[ -n "$(git ls-files '*.yml')$(git ls-files '*.js')$(git ls-files '*.json')" ]]; then
+    info "checking YAML/JavaScript/JSON code style"
     if type -P npm &>/dev/null; then
         echo "+ npx prettier -l -w \$(git ls-files '*.yml') \$(git ls-files '*.js') \$(git ls-files '*.json')"
         npx prettier -l -w $(git ls-files '*.yml') $(git ls-files '*.js') $(git ls-files '*.json')
@@ -114,6 +141,7 @@ if [[ -n "$(git ls-files '*.yml')$(git ls-files '*.js')$(git ls-files '*.json')"
     fi
     # Check GitHub workflows.
     if [[ -d .github/workflows ]]; then
+        info "checking GitHub workflows"
         if type -P jq &>/dev/null && type -P yq &>/dev/null; then
             for workflow in .github/workflows/*.yml; do
                 # The top-level permissions must be weak as they are referenced by all jobs.
@@ -149,6 +177,7 @@ if [[ -n "$(git ls-files '*.yaml')" ]]; then
 fi
 
 # Shell scripts
+info "checking Shell scripts"
 if type -P shfmt &>/dev/null; then
     echo "+ shfmt -l -w \$(git ls-files '*.sh')"
     shfmt -l -w $(git ls-files '*.sh')
@@ -174,6 +203,7 @@ fi
 
 # Spell check (if config exists)
 if [[ -f .cspell.json ]]; then
+    info "spell checking"
     if type -P npm &>/dev/null; then
         has_rust=''
         if [[ -n "$(git ls-files '*Cargo.toml')" ]]; then