Release 2.2.3

https://github.com/taiki-e/cache-cargo-install-action

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ defaults:
 
 jobs:
   tidy:
-    uses: taiki-e/workflows/.github/workflows/tidy-rust.yml@main
+    uses: taiki-e/workflows/.github/workflows/tidy.yml@main
 
   test:
     strategy:
@@ -45,6 +45,7 @@ jobs:
           - os: windows-2019
             tool: cargo-hack,cargo-llvm-cov,cargo-minimal-versions,cargo-no-dev-deps,parse-changelog,cargo-udeps,cargo-valgrind,cargo-deny,cross,dprint,just,nextest,protoc,shellcheck,shfmt,wasm-pack,wasmtime,mdbook,mdbook-linkcheck,cargo-watch,grcov
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 60
     steps:
       - uses: actions/checkout@v3
         with:
@@ -91,6 +92,7 @@ jobs:
             # cargo-udeps,protoc,valgrind,wasmtime,mdbook-linkcheck,cargo-watch don't provide prebuilt binaries for musl host.
             tool: cargo-hack,cargo-llvm-cov,cargo-minimal-versions,cargo-no-dev-deps,parse-changelog,cargo-valgrind,cargo-deny,cross,dprint,just,nextest,shellcheck,shfmt,wasm-pack,mdbook,cargo-binstall,grcov
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     container: ${{ matrix.container }}
     steps:
       - name: Install requirements (ubuntu/debian)
@@ -132,6 +134,7 @@ jobs:
 
   manifest:
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     permissions:
       contents: write # TODO test
       pull-requests: write
@@ -142,6 +145,8 @@ jobs:
       - name: Install Rust
         run: rustup toolchain add nightly --no-self-update && rustup default nightly
       - run: tools/manifest.sh
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - run: git add -N . && git diff --exit-code
         if: github.repository_owner != 'taiki-e' || github.event_name != 'schedule' && !(github.event_name == 'push' && github.ref == 'refs/heads/main')
       - id: diff

.github/workflows/release.yml

@@ -17,6 +17,7 @@ jobs:
   create-release:
     if: github.repository_owner == 'taiki-e'
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     steps:
       - uses: actions/checkout@v3
         with:

CHANGELOG.md

@@ -10,6 +10,16 @@ Note: In this file, do not use the hard wrap in the middle of a sentence for com
 
 ## [Unreleased]
 
+## [2.2.3] - 2023-01-16
+
+- Update `cargo-llvm-cov@latest` to 0.5.9.
+
+## [2.2.2] - 2023-01-15
+
+- Update `cargo-llvm-cov@latest` to 0.5.8.
+
+- Update `cargo-nextest@latest` to 0.9.49.
+
 ## [2.2.1] - 2023-01-12
 
 - Update `cargo-binstall@latest` to 0.19.1.
@@ -549,7 +559,9 @@ Note: This release is considered a breaking change because installing on version
 
 Initial release
 
-[Unreleased]: https://github.com/taiki-e/install-action/compare/v2.2.1...HEAD
+[Unreleased]: https://github.com/taiki-e/install-action/compare/v2.2.3...HEAD
+[2.2.3]: https://github.com/taiki-e/install-action/compare/v2.2.2...v2.2.3
+[2.2.2]: https://github.com/taiki-e/install-action/compare/v2.2.1...v2.2.2
 [2.2.1]: https://github.com/taiki-e/install-action/compare/v2.2.0...v2.2.1
 [2.2.0]: https://github.com/taiki-e/install-action/compare/v2.1.4...v2.2.0
 [2.1.4]: https://github.com/taiki-e/install-action/compare/v2.1.3...v2.1.4

README.md

@@ -125,10 +125,12 @@ To use this action in self-hosted runners or in containers, you will need to ins
 
 ## Related Projects
 
+- [cache-cargo-install-action]: GitHub Action for `cargo install` with cache.
 - [create-gh-release-action]: GitHub Action for creating GitHub Releases based on changelog.
 - [upload-rust-binary-action]: GitHub Action for building and uploading Rust binary to GitHub Releases.
 - [setup-cross-toolchain-action]: GitHub Action for setup toolchains for cross compilation and cross testing for Rust.
 
+[cache-cargo-install-action]: https://github.com/taiki-e/cache-cargo-install-action
 [cargo-binstall]: https://github.com/cargo-bins/cargo-binstall
 [create-gh-release-action]: https://github.com/taiki-e/create-gh-release-action
 [setup-cross-toolchain-action]: https://github.com/taiki-e/setup-cross-toolchain-action

main.js

@@ -1,3 +1,15 @@
+// This is a script that just calls the bash script that does the main
+// processing of the action. It works like a composite action that calls
+// a single bash script.
+//
+// This was originally a trick adopted to make bash script-based actions work
+// without docker before composite actions were supported. However, due to
+// various problems with composite actions, this trick is still needed:
+// - https://github.com/actions/runner/issues/665
+// - https://github.com/actions/runner/issues/2185
+// Although there are ways to work around these like cache-cargo-install-action does:
+// https://github.com/taiki-e/cache-cargo-install-action/blob/v1.0.1/action.yml#L9-L11
+
 const { execFileSync } = require('child_process');
 
 function main() {

main.sh

@@ -11,7 +11,7 @@ x() {
     )
 }
 retry() {
-    for i in {1..5}; do
+    for i in {1..10}; do
         if "$@"; then
             return 0
         else
@@ -226,10 +226,10 @@ install_cargo_binstall() {
     local install_binstall='1'
     if [[ -f "${cargo_bin}/cargo-binstall${exe}" ]]; then
         if [[ "$(cargo binstall -V)" == "${binstall_version}" ]]; then
-            info "cargo-binstall already installed on in ${cargo_bin}/cargo-binstall${exe}"
+            info "cargo-binstall already installed at ${cargo_bin}/cargo-binstall${exe}"
             install_binstall=''
         else
-            info "cargo-binstall already installed on in ${cargo_bin}/cargo-binstall${exe}, but is not compatible version with install-action, upgrading"
+            info "cargo-binstall already installed at ${cargo_bin}/cargo-binstall${exe}, but is not compatible version with install-action, upgrading"
             rm "${cargo_bin}/cargo-binstall${exe}"
         fi
     fi
@@ -291,9 +291,9 @@ snap_install() {
 }
 apk_install() {
     if type -P doas &>/dev/null; then
-        doas apk add "$@"
+        doas apk add --no-cache "$@"
     else
-        apk add "$@"
+        apk add --no-cache "$@"
     fi
 }
 dnf_install() {
@@ -324,6 +324,11 @@ tools=()
 if [[ -n "${tool}" ]]; then
     while read -rd,; do tools+=("${REPLY}"); done <<<"${tool},"
 fi
+if [[ ${#tools[@]} -eq 0 ]]; then
+    warn "no tool specified; this could be caused by a dependabot bug where @<tool_name> tags on this action are replaced by @<version> tags"
+    # Exit with 0 for backward compatibility, we want to reject it in the next major release.
+    exit 0
+fi
 
 enable_checksum="${INPUT_CHECKSUM:-}"
 case "${enable_checksum}" in
@@ -333,34 +338,16 @@ case "${enable_checksum}" in
 esac
 
 # Refs: https://github.com/rust-lang/rustup/blob/HEAD/rustup-init.sh
-case "$(uname -m)" in
-    aarch64 | arm64) host_arch="aarch64" ;;
-    xscale | arm | armv6l | armv7l | armv8l)
-        # Ignore arm for now, as we need to consider the version and whether hard-float is supported.
-        # https://github.com/rust-lang/rustup/pull/593
-        # https://github.com/cross-rs/cross/pull/1018
-        # Does it seem only armv7l is supported?
-        # https://github.com/actions/runner/blob/caec043085990710070108f375cd0aeab45e1017/src/Misc/externals.sh#L174
-        bail "32-bit ARM runner is not supported yet by this action"
-        ;;
-    # GitHub Actions Runner supports Linux (x86_64, aarch64, arm), Windows (x86_64, aarch64),
-    # and macOS (x86_64, aarch64).
-    # https://github.com/actions/runner
-    # https://github.com/actions/runner/blob/caec043085990710070108f375cd0aeab45e1017/.github/workflows/build.yml#L21
-    # https://docs.github.com/en/actions/hosting-your-own-runners/about-self-hosted-runners#supported-architectures-and-operating-systems-for-self-hosted-runners
-    # So we can assume x86_64 unless it is aarch64 or arm.
-    *) host_arch="x86_64" ;;
-esac
 base_distro=""
 exe=""
 case "$(uname -s)" in
     Linux)
         host_os=linux
-        host_env="gnu"
         ldd_version=$(ldd --version 2>&1 || true)
         if grep <<<"${ldd_version}" -q 'musl'; then
             host_env="musl"
         else
+            host_env="gnu"
             host_glibc_version=$(grep <<<"${ldd_version}" -E "GLIBC|GNU libc" | sed "s/.* //g")
         fi
         if grep -q '^ID_LIKE=' /etc/os-release; then
@@ -398,6 +385,24 @@ case "$(uname -s)" in
         ;;
     *) bail "unrecognized OS type '$(uname -s)'" ;;
 esac
+case "$(uname -m)" in
+    aarch64 | arm64) host_arch="aarch64" ;;
+    xscale | arm | armv6l | armv7l | armv8l)
+        # Ignore arm for now, as we need to consider the version and whether hard-float is supported.
+        # https://github.com/rust-lang/rustup/pull/593
+        # https://github.com/cross-rs/cross/pull/1018
+        # Does it seem only armv7l is supported?
+        # https://github.com/actions/runner/blob/caec043085990710070108f375cd0aeab45e1017/src/Misc/externals.sh#L174
+        bail "32-bit ARM runner is not supported yet by this action"
+        ;;
+    # GitHub Actions Runner supports Linux (x86_64, aarch64, arm), Windows (x86_64, aarch64),
+    # and macOS (x86_64, aarch64).
+    # https://github.com/actions/runner
+    # https://github.com/actions/runner/blob/caec043085990710070108f375cd0aeab45e1017/.github/workflows/build.yml#L21
+    # https://docs.github.com/en/actions/hosting-your-own-runners/about-self-hosted-runners#supported-architectures-and-operating-systems-for-self-hosted-runners
+    # So we can assume x86_64 unless it is aarch64 or arm.
+    *) host_arch="x86_64" ;;
+esac
 
 tmp_dir="${HOME}/.install-action/tmp"
 cargo_bin="${CARGO_HOME:-"${HOME}/.cargo"}/bin"
@@ -420,25 +425,19 @@ if ! type -P jq &>/dev/null || ! type -P curl &>/dev/null || ! type -P tar &>/de
     esac
 fi
 
-if [[ ${#tools[@]} -eq 0 ]]; then
-    warn "no tool specified; this could be caused by a dependabot bug where @<tool_name> tags on this action are replaced by @<version> tags"
-    # Exit with 0 for backward compatibility, we want to reject it in the next major release.
-    exit 0
-fi
-
 for tool in "${tools[@]}"; do
     if [[ "${tool}" == *"@"* ]]; then
         version="${tool#*@}"
+        tool="${tool%@*}"
         if [[ ! "${version}" =~ ^([1-9][0-9]*(\.[0-9]+(\.[0-9]+)?)?|0\.[1-9][0-9]*(\.[0-9]+)?|^0\.0\.[0-9]+)$|^latest$ ]]; then
             if [[ ! "${version}" =~ ^([1-9][0-9]*(\.[0-9]+(\.[0-9]+)?)?|0\.[1-9][0-9]*(\.[0-9]+)?|^0\.0\.[0-9]+)(-[0-9A-Za-z\.-]+)?(\+[0-9A-Za-z\.-]+)?$|^latest$ ]]; then
-                bail "install-action does not support semver operators"
+                bail "install-action does not support semver operators: '${version}'"
             fi
-            bail "install-action v2 does not support semver pre-release and build-metadata; please submit an issue if you need these supports again"
+            bail "install-action v2 does not support semver pre-release and build-metadata; please submit an issue if you need these supports again: '${version}'"
         fi
     else
         version="latest"
     fi
-    tool="${tool%@*}"
     info "installing ${tool}@${version}"
     case "${tool}" in
         protoc)

manifests/cargo-llvm-cov.json

@@ -17,10 +17,44 @@
     }
   },
   "latest": {
-    "version": "0.5.7"
+    "version": "0.5.9"
   },
   "0.5": {
-    "version": "0.5.7"
+    "version": "0.5.9"
+  },
+  "0.5.9": {
+    "x86_64_linux_musl": {
+      "checksum": "aadde3416c86403f72986f6c68001d2a46497ee8892f5affdb6b681213b586a2"
+    },
+    "x86_64_macos": {
+      "checksum": "7f7d17223237cc2ea65a4cd2d3ea0f0868711bd44dd56ee35839b41202b08685"
+    },
+    "x86_64_windows": {
+      "checksum": "efd986565868a0f1a255af9b913e77b95eb77b49940a93dde4e2c88874f2da39"
+    },
+    "aarch64_linux_musl": {
+      "checksum": "d6d539c038a07c12e04954af3357afadadf92ca3eacf5a155eb555b47d3b1ca4"
+    },
+    "aarch64_macos": {
+      "checksum": "4a023a922507d8a63424cb4b3d98c695fc2a66f8596b1e93b3a573afc2a384c5"
+    }
+  },
+  "0.5.8": {
+    "x86_64_linux_musl": {
+      "checksum": "78a2b85c54d2ecf76ad7309278901c2f4d6dcc611ef095844e8c6bd87b2d6a72"
+    },
+    "x86_64_macos": {
+      "checksum": "b1227359e4994f9ee96247bc2d47e36612f0b5344f9010f31ac965163a44e98c"
+    },
+    "x86_64_windows": {
+      "checksum": "d18f4da434596eb2c4aa2eaa95e00482130affa0a1710046c2d29c5c6edcb202"
+    },
+    "aarch64_linux_musl": {
+      "checksum": "11a3018bd91ff62806e7aa3413c5dc9af22ede870af4850866dbfe94cec0bd70"
+    },
+    "aarch64_macos": {
+      "checksum": "d4c67fac1dfa16cb130142bb572b310de856a8ec0494cc95351b5d82507793f2"
+    }
   },
   "0.5.7": {
     "x86_64_linux_musl": {

manifests/cargo-nextest.json

@@ -17,10 +17,27 @@
     }
   },
   "latest": {
-    "version": "0.9.48"
+    "version": "0.9.49"
   },
   "0.9": {
-    "version": "0.9.48"
+    "version": "0.9.49"
+  },
+  "0.9.49": {
+    "x86_64_linux_gnu": {
+      "checksum": "5e19c5038c9940da4c47a9ae87f94b352dc98c2ab75b4b9aeae227cdff8440d2"
+    },
+    "x86_64_linux_musl": {
+      "checksum": "b09d7870bba824af1acfce505811951f0d81cf21b144490c6a3f34f59bcc182b"
+    },
+    "x86_64_macos": {
+      "checksum": "171bc696474667208587c74d9acce0250f3b2eac1faad39458e828a65c3f1c93"
+    },
+    "x86_64_windows": {
+      "checksum": "e9c532bb99c6e8e7edb65578f8c251fb3d87a3377bef1128763442dc7f088ebb"
+    },
+    "aarch64_linux_gnu": {
+      "checksum": "40ff81ed279e8a6d38ebe06ee75bba47785e8cb006267e35a15c157724e8e437"
+    }
   },
   "0.9.48": {
     "x86_64_linux_gnu": {

tools/codegen/src/main.rs

@@ -385,23 +385,35 @@ fn replace_vars(s: &str, package: &str, version: &str, platform: HostPlatform) -
 }
 
 fn download(url: &str) -> Result<ureq::Response> {
-    let token = env::var("INTERNAL_CODEGEN_GH_PAT").ok();
+    let mut token1 = env::var("INTERNAL_CODEGEN_GH_PAT")
+        .ok()
+        .filter(|v| !v.is_empty());
+    let mut token2 = env::var("GITHUB_TOKEN").ok().filter(|v| !v.is_empty());
     let mut retry = 0;
     let mut last_error;
     loop {
         let mut req = ureq::get(url);
-        if let Some(token) = &token {
+        if let Some(token) = &token1 {
+            req = req.set("Authorization", token);
+        } else if let Some(token) = &token2 {
             req = req.set("Authorization", token);
         }
         match req.call() {
             Ok(res) => return Ok(res),
             Err(e) => last_error = Some(e),
         }
+        if retry == 3 || retry == 6 {
+            if token1.is_some() {
+                token1 = None;
+            } else if token2.is_some() {
+                token2 = None;
+            }
+        }
         retry += 1;
-        if retry > 5 {
+        if retry > 10 {
             break;
         }
-        eprintln!("download failed; retrying ({retry}/5)");
+        eprintln!("download failed; retrying ({retry}/10)");
         std::thread::sleep(Duration::from_secs(retry * 2));
     }
     Err(last_error.unwrap().into())

tools/publish.sh

@@ -21,7 +21,9 @@ bail() {
 
 version="${1:?}"
 version="${version#v}"
-tag="v${version}"
+tag_prefix="v"
+tag="${tag_prefix}${version}"
+changelog="CHANGELOG.md"
 if [[ ! "${version}" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-[0-9A-Za-z\.-]+)?(\+[0-9A-Za-z\.-]+)?$ ]]; then
     bail "invalid version format '${version}'"
 fi
@@ -38,44 +40,55 @@ if gh release view "${tag}" &>/dev/null; then
     bail "tag '${tag}' has already been created and pushed"
 fi
 
-if ! git branch | grep -q '\* main'; then
+if ! git branch | grep -q '\* main$'; then
     bail "current branch is not 'main'"
 fi
 
-tags=$(git --no-pager tag)
+release_date=$(date -u '+%Y-%m-%d')
+tags=$(git --no-pager tag | (grep -E "^${tag_prefix}[0-9]+" || true))
 if [[ -n "${tags}" ]]; then
-    # Make sure the same release does not exist in CHANGELOG.md.
-    release_date=$(date -u '+%Y-%m-%d')
-    if grep -Eq "^## \\[${version//./\\.}\\] - ${release_date}$" CHANGELOG.md; then
-        bail "release ${version} already exist in CHANGELOG.md"
+    # Make sure the same release does not exist in changelog.
+    if grep -Eq "^## \\[${version//./\\.}\\]" "${changelog}"; then
+        bail "release ${version} already exist in ${changelog}"
     fi
-    if grep -Eq "^\\[${version//./\\.}\\]: " CHANGELOG.md; then
-        bail "link to ${version} already exist in CHANGELOG.md"
+    if grep -Eq "^\\[${version//./\\.}\\]: " "${changelog}"; then
+        bail "link to ${version} already exist in ${changelog}"
     fi
-
     # Update changelog.
-    remote_url=$(grep -E '^\[Unreleased\]: https://' CHANGELOG.md | sed 's/^\[Unreleased\]: //; s/\.\.\.HEAD$//')
+    remote_url=$(grep -E '^\[Unreleased\]: https://' "${changelog}" | sed 's/^\[Unreleased\]: //; s/\.\.\.HEAD$//')
     before_tag="${remote_url#*/compare/}"
     remote_url="${remote_url%/compare/*}"
-    sed -i "s/^## \\[Unreleased\\]/## [Unreleased]\\n\\n## [${version}] - ${release_date}/" CHANGELOG.md
-    sed -i "s#^\[Unreleased\]: https://.*#[Unreleased]: ${remote_url}/compare/v${version}...HEAD\\n[${version}]: ${remote_url}/compare/${before_tag}...v${version}#" CHANGELOG.md
-    if ! grep -Eq "^## \\[${version//./\\.}\\] - ${release_date}$" CHANGELOG.md; then
-        bail "failed to update CHANGELOG.md"
+    sed -i "s/^## \\[Unreleased\\]/## [Unreleased]\\n\\n## [${version}] - ${release_date}/" "${changelog}"
+    sed -i "s#^\[Unreleased\]: https://.*#[Unreleased]: ${remote_url}/compare/${tag}...HEAD\\n[${version}]: ${remote_url}/compare/${before_tag}...${tag}#" "${changelog}"
+    if ! grep -Eq "^## \\[${version//./\\.}\\] - ${release_date}$" "${changelog}"; then
+        bail "failed to update ${changelog}"
     fi
-    if ! grep -Eq "^\\[${version//./\\.}\\]: " CHANGELOG.md; then
-        bail "failed to update CHANGELOG.md"
+    if ! grep -Eq "^\\[${version//./\\.}\\]: " "${changelog}"; then
+        bail "failed to update ${changelog}"
+    fi
+else
+    # Make sure the release exists in changelog.
+    if ! grep -Eq "^## \\[${version//./\\.}\\] - ${release_date}$" "${changelog}"; then
+        bail "release ${version} does not exist in ${changelog} or has wrong release date"
+    fi
+    if ! grep -Eq "^\\[${version//./\\.}\\]: " "${changelog}"; then
+        bail "link to ${version} does not exist in ${changelog}"
     fi
 fi
 
 # Make sure that a valid release note for this version exists.
 # https://github.com/taiki-e/parse-changelog
+changes=$(parse-changelog "${changelog}" "${version}")
+if [[ -z "${changes}" ]]; then
+    bail "changelog for ${version} has no body"
+fi
 echo "============== CHANGELOG =============="
-parse-changelog CHANGELOG.md "${version}"
+echo "${changes}"
 echo "======================================="
 
 if [[ -n "${tags}" ]]; then
     # Create a release commit.
-    git add CHANGELOG.md
+    git add "${changelog}"
     git commit -m "Release ${version}"
 fi