Skip to content

Commit

Permalink
.
Browse files Browse the repository at this point in the history
  • Loading branch information
pavelzw committed Jun 5, 2024
1 parent 50b182c commit 2d55bd3
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,7 @@ jobs:
- uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84
with:
key: tests
- name: Run clippy
run: pixi run clippy --color always${{ startsWith(matrix.os, 'ubuntu-latest') && ' --no-default-features --features rustls-tls' || '' }}
- name: Run test
run: pixi run test --color always ${{ startsWith(matrix.os, 'ubuntu-latest') && '--no-default-features --features rustls-tls' || '' }}
run: pixi run test --color always${{ startsWith(matrix.os, 'ubuntu-latest') && ' --no-default-features --features rustls-tls' || '' }}
9 changes: 1 addition & 8 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,13 @@ repos:
language: system
types: [text]
require_serial: true
# cargo fmt and clippy
# cargo fmt
- id: cargo-fmt
name: cargo-fmt
entry: pixi run -e default cargo fmt --
language: system
require_serial: false
types: [rust]
- id: cargo-clippy
name: cargo-clippy
entry: pixi run -e default cargo clippy --all-targets --all-features --workspace -- -D warnings
pass_filenames: false
language: system
require_serial: false
types: [rust]
# taplo
- id: taplo
name: taplo
Expand Down
3 changes: 3 additions & 0 deletions activate-openssl.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/env bash

export OPENSSL_DIR="$CONDA_PREFIX"
7 changes: 5 additions & 2 deletions pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,11 @@ test = "cargo test"
rust = "1.77.2"
openssl = "3.*"

[activation.env]
OPENSSL_DIR="$CONDA_PREFIX"
[activation]
scripts = ["activate-openssl.sh"]
# TODO: once TODO is fixed, replace with
# [activation.env]
# OPENSSL_DIR = "$CONDA_PREFIX"

[target.linux.dependencies]
compilers = ">=1.7.0"
Expand Down

0 comments on commit 2d55bd3

Please sign in to comment.