Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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)"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/// # Examples
///
/// ```
/// use mpsc-log::greet;
/// use mpsc_log::greet;
///
/// assert_eq!(greet(), "Hello from mpsc-log!");
/// ```
Expand Down
Loading