Skip to content

Commit

Permalink
Rm openssl pulled in dev and rm feat dev
Browse files Browse the repository at this point in the history
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
  • Loading branch information
NobodyXu committed May 1, 2023
1 parent 8f0d95e commit 2006932
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 129 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ jobs:
if: ${{ matrix.target == 'aarch64-unknown-linux-musl' }}

- name: Build
run: cargo build --locked --release --bin ${{ matrix.binary || 'sccache' }} --target ${{ matrix.target }} --features=dev ${{ matrix.extra_args }}
run: cargo build --locked --release --bin ${{ matrix.binary || 'sccache' }} --target ${{ matrix.target }} ${{ matrix.extra_args }}
env:
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER: aarch64-linux-musl-gcc
MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macosx_deployment_target }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ jobs:
target: $TARGET

- name: Build
run: cargo build --bin sccache --target $env:TARGET --features=dev
run: cargo build --bin sccache --target $env:TARGET

- name: Compile MSVC (no cache)
shell: bash
Expand Down
115 changes: 0 additions & 115 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 1 addition & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,13 @@ rsa = { version = "0.8.2", optional = true }
chrono = { version = "0.4.24", default-features = false, features = ["std", "clock"], optional = true }
picky = { version = "6.3.0", default-features = false, features = ["x509"], optional = true }

# For dev-only
openssl = { version = "0.10", features = ["vendored"], optional = true }

[dev-dependencies]
assert_cmd = "2.0.10"
cc = "1.0"
chrono = "0.4.24"
itertools = "0.10"
predicates = "=3.0.2"
thirtyfour_sync = "0.27"
thirtyfour_sync = { version = "0.27", default-features = false, features = ["reqwest-rustls-tls"] }
once_cell = "1.17"
serial_test = "2.0"

Expand Down Expand Up @@ -142,14 +139,6 @@ dist-client = ["flate2", "hyper", "reqwest", "url", "sha2"]
dist-server = ["jwt", "flate2", "libmount", "nix", "rsa", "chrono", "picky", "sha2", "reqwest", "rouille", "syslog", "void", "version-compare"]
# Enables dist tests with external requirements
dist-tests = ["dist-client", "dist-server"]
# Only enable this feature during dev or in ci, where dev-dependencies are also
# built in additional to regular dependencies.
#
# Enable features that will build a vendored version of openssl and
# statically linked with it, instead of linking against the system-wide openssl
# dynamically or statically.
# Enable features that require unstable features of Nightly Rust.
dev = ["openssl"]

[workspace]
exclude = ["tests/test-crate"]

0 comments on commit 2006932

Please sign in to comment.