diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 248ed43..0f11b28 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: env: CARGO_TERM_COLOR: always BUILD_PROFILE: debug - WHITAKER_INSTALLER_REV: f768c2e53c47df13658af1168a67851d388750bf + WHITAKER_INSTALLER_VERSION: '0.2.5' steps: - uses: actions/checkout@900f2210b1d28bbbd0bd22d17926b9e224e8f231 with: @@ -57,28 +57,25 @@ jobs: uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 with: python-version: '3.x' - - name: Cache Whitaker installation - id: cache-whitaker + - name: Cache Whitaker installer uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae with: path: | ~/.cargo/bin/whitaker-installer - ~/.local/bin/whitaker - ~/.dylint_drivers - ~/.local/share/whitaker - key: whitaker-v2-${{ runner.os }}-${{ env.WHITAKER_INSTALLER_REV }} + ~/.cache/cargo-binstall + key: whitaker-installer-${{ runner.os }}-${{ runner.arch }}-${{ env.WHITAKER_INSTALLER_VERSION }} - name: Install Whitaker env: RUSTFLAGS: "" run: | set -euo pipefail - echo "Whitaker cache hit: ${{ steps.cache-whitaker.outputs.cache-hit }}" - if [ "${{ steps.cache-whitaker.outputs.cache-hit }}" != "true" ]; then - echo "Installing Whitaker installer at ${WHITAKER_INSTALLER_REV}" - cargo install --locked \ - --git https://github.com/leynos/whitaker \ - --rev "${WHITAKER_INSTALLER_REV}" \ - whitaker-installer + if ! command -v whitaker-installer >/dev/null 2>&1; then + if cargo binstall --version >/dev/null 2>&1; then + cargo binstall --no-confirm --locked "whitaker-installer@${WHITAKER_INSTALLER_VERSION}" + else + echo "cargo-binstall unavailable; building whitaker-installer from crates.io" + cargo install --locked whitaker-installer --version "${WHITAKER_INSTALLER_VERSION}" + fi fi whitaker-installer --cranelift echo "Whitaker binary: $(command -v whitaker || true)" diff --git a/Makefile b/Makefile index ca0da8b..2f241f8 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ coverage: ## Generate lcov coverage with lld for llvm-tools compatibility LDFLAGS="$(COVERAGE_LINKER_FLAGS)" \ $(CARGO) llvm-cov --lcov --output-path lcov.info $(TEST_FLAGS) -lint: ## Run Clippy with warnings denied +lint: ## Run Clippy and the Whitaker Dylint suite with warnings denied RUSTDOCFLAGS="$(RUSTDOC_FLAGS)" $(CARGO) doc --no-deps $(CARGO) clippy $(CLIPPY_FLAGS) @echo "Whitaker binary: $(WHITAKER)" diff --git a/src/lib.rs b/src/lib.rs index 3912b6f..06518ad 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -6,7 +6,7 @@ /// # Examples /// /// ``` -/// use mpsc-log::greet; +/// use mpsc_log::greet; /// /// assert_eq!(greet(), "Hello from mpsc-log!"); /// ```