Release 2.6.9

Co-authored-by: Taiki Endo <te316e89@gmail.com>

.github/.cspell/organization-dictionary.txt

@@ -29,6 +29,7 @@ Zmiri
 
 // Rust target triple
 aarch
+amdgpu
 androideabi
 armeb
 armebv
@@ -66,6 +67,7 @@ openwrt
 riscv
 softfloat
 sparcv
+spirv
 thumbeb
 thumbebv
 thumbv
@@ -88,12 +90,14 @@ bools
 builtins
 bytecount
 canonicalize
+concat
 consts
 ctypes
 dealloc
 deque
 docsrs
 doctest
+doctests
 hasher
 impls
 inlateout
@@ -145,7 +149,9 @@ objdump
 pipefail
 powerset
 proto
+ranlib
 readelf
+shellcheckrc
 SIGABRT
 SIGILL
 SIGINT

.github/.cspell/project-dictionary.txt

@@ -1,5 +1,4 @@
 binstall
-bytecodealliance
 coreutils
 distro
 doas
@@ -7,21 +6,15 @@ dprint
 enablerepo
 epel
 grcov
-jfrimmel
-koalaman
 libc
 linkcheck
 mdbook
 microdnf
-mvdan
 nextest
-protobuf
 protoc
-protocolbuffers
 pwsh
 quickinstall
 rockylinux
-rustwasm
 shellcheck
 shfmt
 udeps

.github/workflows/release.yml

@@ -29,4 +29,3 @@ jobs:
           title: $version
           branch: 'main|v[0-9]+'
           token: ${{ secrets.GITHUB_TOKEN }}
-      - run: ci/publish.sh

CHANGELOG.md

@@ -10,6 +10,18 @@ Note: In this file, do not use the hard wrap in the middle of a sentence for com
 
 ## [Unreleased]
 
+## [2.6.9] - 2023-04-05
+
+- Update `cargo-llvm-cov@latest` to 0.5.14.
+
+## [2.6.8] - 2023-04-05
+
+- Update `cargo-tarpaulin@latest` to 0.25.2.
+
+## [2.6.7] - 2023-04-04
+
+- Update `cargo-llvm-cov@latest` to 0.5.13.
+
 ## [2.6.6] - 2023-04-02
 
 - Update `cargo-llvm-cov@latest` to 0.5.12.
@@ -703,7 +715,10 @@ 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.6...HEAD
+[Unreleased]: https://github.com/taiki-e/install-action/compare/v2.6.9...HEAD
+[2.6.9]: https://github.com/taiki-e/install-action/compare/v2.6.8...v2.6.9
+[2.6.8]: https://github.com/taiki-e/install-action/compare/v2.6.7...v2.6.8
+[2.6.7]: https://github.com/taiki-e/install-action/compare/v2.6.6...v2.6.7
 [2.6.6]: https://github.com/taiki-e/install-action/compare/v2.6.5...v2.6.6
 [2.6.5]: https://github.com/taiki-e/install-action/compare/v2.6.4...v2.6.5
 [2.6.4]: https://github.com/taiki-e/install-action/compare/v2.6.3...v2.6.4

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-llvm-cov.json

@@ -17,10 +17,44 @@
     }
   },
   "latest": {
-    "version": "0.5.12"
+    "version": "0.5.14"
   },
   "0.5": {
-    "version": "0.5.12"
+    "version": "0.5.14"
+  },
+  "0.5.14": {
+    "x86_64_linux_musl": {
+      "checksum": "688e56f78611f7866842f5b86e27672225b28c8a536c75d6c0a3fd67082474ea"
+    },
+    "x86_64_macos": {
+      "checksum": "8d4a93175d5ba0710a46ccab007444cea4c53406b4c0b6c6ae6916d1192ac333"
+    },
+    "x86_64_windows": {
+      "checksum": "5773b119db63bbbcb975ecd3e0c71ae548506d85312248d6d3e94758cf88bba6"
+    },
+    "aarch64_linux_musl": {
+      "checksum": "61b22ff22d95ca6af9c668c780fe2a23a519a44d1fab3de01adadfbb36cea54d"
+    },
+    "aarch64_macos": {
+      "checksum": "f98c5d4bc2f7b67328a82028bb78f0a67436ae81a4e2a7911fd4f18f572c434b"
+    }
+  },
+  "0.5.13": {
+    "x86_64_linux_musl": {
+      "checksum": "e57875cba95527149d15d7f9c66b9d624d8154040f19aedbca96e2c6b7687ffb"
+    },
+    "x86_64_macos": {
+      "checksum": "f694bcaf714f352b76182b0aeec9626ca5280ceca275f949caa762a561030350"
+    },
+    "x86_64_windows": {
+      "checksum": "642046071c3c221748a3a6a08b5c7d71d7644928d4d7707fa30b38da8357f074"
+    },
+    "aarch64_linux_musl": {
+      "checksum": "d9173b2aae99f29276cd7d84ffdea9eb29f8831acd3f9d9de1c2af4366d917df"
+    },
+    "aarch64_macos": {
+      "checksum": "b9bb4d03065c4d7e52ed4148d71d36a4c890dee37108addfa9ba19771e46fa1d"
+    }
   },
   "0.5.12": {
     "x86_64_linux_musl": {

manifests/cargo-tarpaulin.json

@@ -17,10 +17,27 @@
     }
   },
   "latest": {
-    "version": "0.25.1"
+    "version": "0.25.2"
   },
   "0.25": {
-    "version": "0.25.1"
+    "version": "0.25.2"
+  },
+  "0.25.2": {
+    "x86_64_linux_musl": {
+      "checksum": "89f0f28baa818f445336da35c204206544b5e1160892ca0d5f50fe034abff771"
+    },
+    "x86_64_macos": {
+      "checksum": "fac48ad01a87435b35a0d04dbb5452929c72e3e28633ab0fb5740a50d113bf64"
+    },
+    "x86_64_windows": {
+      "checksum": "36cf0c7fcf1c1d589720e7409673535e46d734f9abf89ff179c964dbf24f56cc"
+    },
+    "aarch64_linux_musl": {
+      "checksum": "2600c6a6e8f6cdaf374fa492284ade31c4582f40f9c5ede1f726b743e144f9b6"
+    },
+    "aarch64_macos": {
+      "checksum": "3f615f38c18c32d10fdf85b73e5c5ee05c0308566d00d0b117c10175f659c504"
+    }
   },
   "0.25.1": {
     "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}"
+    git add "${changelog}"
-    x git commit -m "Release ${version}"
+    git commit -m "Release ${version}"
 fi
 
-x git tag "${tag}"
+tools=()
-# TODO: the following still assumes admin permissions
+for tool in tools/codegen/base/*.json; do
-x git push origin main
+    tools+=("$(basename "${tool%.*}")")
-x git push origin --tags
+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

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# SPDX-License-Identifier: Apache-2.0 OR MIT
 # shellcheck disable=SC2046
 set -euo pipefail
 IFS=$'\n\t'
@@ -33,6 +34,9 @@ check_diff() {
         fi
     fi
 }
+info() {
+    echo >&2 "info: $*"
+}
 warn() {
     if [[ -n "${GITHUB_ACTIONS:-}" ]]; then
         echo "::warning::$*"
@@ -171,7 +175,9 @@ fi
 # Spell check (if config exists)
 if [[ -f .cspell.json ]]; then
     if type -P npm &>/dev/null; then
+        has_rust=''
         if [[ -n "$(git ls-files '*Cargo.toml')" ]]; then
+            has_rust='1'
             dependencies=''
             for manifest_path in $(git ls-files '*Cargo.toml'); do
                 if [[ "${manifest_path}" != "Cargo.toml" ]] && ! grep -Eq '\[workspace\]' "${manifest_path}"; then
@@ -179,24 +185,27 @@ if [[ -f .cspell.json ]]; then
                 fi
                 metadata=$(cargo metadata --format-version=1 --all-features --no-deps --manifest-path "${manifest_path}")
                 for id in $(jq <<<"${metadata}" '.workspace_members[]'); do
-                    dependencies+=$'\n'
+                    dependencies+="$(jq <<<"${metadata}" ".packages[] | select(.id == ${id})" | jq -r '.dependencies[].name')"$'\n'
-                    dependencies+=$(jq <<<"${metadata}" ".packages[] | select(.id == ${id})" | jq -r '.dependencies[].name')
                 done
             done
             # shellcheck disable=SC2001
             dependencies=$(sed <<<"${dependencies}" 's/[0-9_-]/\n/g' | LC_ALL=C sort -f -u)
-            config_old=$(<.cspell.json)
-            config_new=$(grep <<<"${config_old}" -v ' *//' | jq 'del(.dictionaries[] | select(index("organization-dictionary") | not))' | jq 'del(.dictionaryDefinitions[] | select(.name == "organization-dictionary" | not))')
-            echo "${config_new}" >.cspell.json
-            words=$(npx <<<"${dependencies}" cspell stdin --no-progress --no-summary --words-only --unique || true)
-            echo "${config_old}" >.cspell.json
         fi
+        config_old=$(<.cspell.json)
+        config_new=$(grep <<<"${config_old}" -v ' *//' | jq 'del(.dictionaries[] | select(index("organization-dictionary") | not))' | jq 'del(.dictionaryDefinitions[] | select(.name == "organization-dictionary" | not))')
+        echo "${config_new}" >.cspell.json
+        if [[ -n "${has_rust}" ]]; then
+            dependencies_words=$(npx <<<"${dependencies}" cspell stdin --no-progress --no-summary --words-only --unique || true)
+        fi
+        all_words=$(npx cspell --no-progress --no-summary --words-only --unique $(git ls-files | (grep -v '\.github/\.cspell/project-dictionary\.txt' || true)) || true)
+        # TODO: handle SIGINT
+        echo "${config_old}" >.cspell.json
         cat >.github/.cspell/rust-dependencies.txt <<EOF
 // This file is @generated by $(basename "$0").
 // It is not intended for manual editing.
 EOF
-        if [[ -n "${words:-}" ]]; then
+        if [[ -n "${dependencies_words:-}" ]]; then
-            echo $'\n'"${words}" >>.github/.cspell/rust-dependencies.txt
+            echo $'\n'"${dependencies_words}" >>.github/.cspell/rust-dependencies.txt
         fi
         check_diff .github/.cspell/rust-dependencies.txt
         if ! grep -Eq "^\.github/\.cspell/rust-dependencies.txt linguist-generated" .gitattributes; then
@@ -204,8 +213,11 @@ EOF
         fi
 
         echo "+ npx cspell --no-progress --no-summary \$(git ls-files)"
-        npx cspell --no-progress --no-summary $(git ls-files)
+        if ! npx cspell --no-progress --no-summary $(git ls-files); then
+            error "spellcheck failed: please fix uses of above words or add to .github/.cspell/project-dictionary.txt if correct"
+        fi
 
+        # Make sure the project-specific dictionary does not contain duplicated words.
         for dictionary in .github/.cspell/*.txt; do
             if [[ "${dictionary}" == .github/.cspell/project-dictionary.txt ]]; then
                 continue
@@ -218,6 +230,20 @@ EOF
                 echo "======================================="
             fi
         done
+
+        # Make sure the project-specific dictionary does not contain unused words.
+        unused=''
+        for word in $(grep -v '//.*' .github/.cspell/project-dictionary.txt || true); do
+            if ! grep <<<"${all_words}" -Eq -i "^${word}$"; then
+                unused+="${word}"$'\n'
+            fi
+        done
+        if [[ -n "${unused}" ]]; then
+            error "unused words in dictionaries; please remove the following words from .github/.cspell/project-dictionary.txt"
+            echo "======================================="
+            echo -n "${unused}"
+            echo "======================================="
+        fi
     else
         warn "'npm' is not installed"
     fi