From bb54a45fbd0e860a51916a166d0c2f837993f33f Mon Sep 17 00:00:00 2001 From: "Daniel Szoke (via Pi Coding Agent)" Date: Wed, 11 Feb 2026 17:17:16 +0000 Subject: [PATCH] ci(workflow): Replace make targets and remove Makefile Replace CI make invocations with explicit cargo commands to make workflow behavior easier to read directly in the CI config. Remove the root Makefile to avoid maintaining a separate command layer in addition to the workflow definitions. Closes GH-973 Closes [RUST-139](https://linear.app/getsentry/issue/RUST-139/delete-the-makefile-and-remove-references) --- .github/workflows/ci.yml | 55 +++++++++++++++++++++-- Makefile | 94 ---------------------------------------- 2 files changed, 52 insertions(+), 97 deletions(-) delete mode 100644 Makefile diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 333ff7315..2c13073b2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,45 @@ jobs: - uses: Swatinem/rust-cache@v2 - - run: make checkall + - name: Check all features + run: cargo check --all-features + env: + RUSTFLAGS: -Dwarnings + + - name: Check sentry-core without default features + run: cargo check --no-default-features + working-directory: sentry-core + env: + RUSTFLAGS: -Dwarnings + + - name: Check default features + run: cargo check + env: + RUSTFLAGS: -Dwarnings + + - name: Check sentry panic feature without defaults + run: cargo check --no-default-features --features panic + working-directory: sentry + env: + RUSTFLAGS: -Dwarnings + + - name: Check sentry curl feature + run: cargo check --features curl + working-directory: sentry + env: + RUSTFLAGS: -Dwarnings + + - name: Check sentry curl+panic without defaults + run: cargo check --no-default-features --features curl,panic + working-directory: sentry + env: + RUSTFLAGS: -Dwarnings + + - name: Check sentry-actix + run: cargo check + working-directory: sentry-actix + env: + RUSTFLAGS: -Dwarnings test: strategy: @@ -81,9 +119,20 @@ jobs: - uses: Swatinem/rust-cache@v2 - - run: make checkfast + - name: Check sentry-core without default features + run: cargo check --no-default-features + working-directory: sentry-core + env: + RUSTFLAGS: -Dwarnings - - run: make testfast + - name: Check default features + run: cargo check + env: + RUSTFLAGS: -Dwarnings + + - name: Test sentry test feature + run: cargo test --features=test + working-directory: sentry codecov: name: Code Coverage diff --git a/Makefile b/Makefile deleted file mode 100644 index 685a92bca..000000000 --- a/Makefile +++ /dev/null @@ -1,94 +0,0 @@ -all: check -.PHONY: all - -clean: - @cargo clean -.PHONY: clean - -build: - @cargo build -.PHONY: build - -doc: - @cargo doc -.PHONY: doc - -check: style lint test -.PHONY: check - -# Linting - -style: - @rustup component add rustfmt --toolchain stable 2> /dev/null - cargo +stable fmt -- --check -.PHONY: style - -format: - @rustup component add rustfmt --toolchain stable 2> /dev/null - cargo +stable fmt -.PHONY: format - -lint: - @rustup component add clippy --toolchain stable 2> /dev/null - cargo +stable clippy --all-features --tests --examples -- -D clippy::all -.PHONY: lint - -fix: - @rustup component add clippy --toolchain stable 2> /dev/null - cargo +stable clippy --all-features --workspace --tests --examples --fix -- -D clippy::all -.PHONY: fix - -# Tests - -test: checkall testall -.PHONY: test - -testfast: - @echo 'TESTSUITE' - cd sentry && cargo test --features=test -.PHONY: testfast - -testall: - @echo 'TESTSUITE' - cargo test --all-features -.PHONY: testall - -# Checks - -checkfast: check-no-default-features check-default-features -.PHONY: checkfast - -checkall: check-all-features check-no-default-features check-default-features check-panic check-curl-transport check-actix -.PHONY: checkall - -check-all-features: - @echo 'ALL FEATURES' - @RUSTFLAGS=-Dwarnings cargo check --all-features -.PHONY: check-all-features - -check-default-features: - @echo 'DEFAULT FEATURES' - @RUSTFLAGS=-Dwarnings cargo check -.PHONY: check-default-features - -check-no-default-features: - @echo 'NO DEFAULT FEATURES' - @cd sentry-core && RUSTFLAGS=-Dwarnings cargo check --no-default-features -.PHONY: check-no-default-features - -check-panic: - @echo 'NO CLIENT + PANIC' - @cd sentry && RUSTFLAGS=-Dwarnings cargo check --no-default-features --features 'panic' -.PHONY: check-panic - -check-curl-transport: - @echo 'CURL TRANSPORT' - @cd sentry && RUSTFLAGS=-Dwarnings cargo check --features curl - @echo 'CURL TRANSPORT ONLY' - @cd sentry && RUSTFLAGS=-Dwarnings cargo check --no-default-features --features 'curl,panic' -.PHONY: check-curl-transport - -check-actix: - @echo 'ACTIX INTEGRATION' - @cd sentry-actix && RUSTFLAGS=-Dwarnings cargo check -.PHONY: check-actix