Skip to content

Commit

Permalink
Merge pull request #133 from piotr-roslaniec/replace-actions-rs
Browse files Browse the repository at this point in the history
Replace deprecated `actions-rs/*` GH Actions
  • Loading branch information
piotr-roslaniec authored Jan 22, 2024
2 parents 47867d2 + f26eb43 commit b3eaa7a
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 31 deletions.
32 changes: 11 additions & 21 deletions .github/workflows/umbral-pre.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,10 @@ jobs:
- wasm32-unknown-unknown
steps:
- uses: actions/checkout@v4
- uses: actions-rs/toolchain@v1
- uses: dtolnay/rust-toolchain@v1
with:
profile: minimal
toolchain: ${{ matrix.rust }}
target: ${{ matrix.target }}
override: true
targets: ${{ matrix.target }}
#- run: cp ../../Cargo.lock .. # Use same Cargo.lock resolution that's checked in
- run: cargo build --features bindings-wasm --release --target ${{ matrix.target }}

Expand All @@ -53,12 +51,10 @@ jobs:
- thumbv7em-none-eabi
steps:
- uses: actions/checkout@v4
- uses: actions-rs/toolchain@v1
- uses: dtolnay/rust-toolchain@v1
with:
profile: minimal
toolchain: ${{ matrix.rust }}
target: ${{ matrix.target }}
override: true
targets: ${{ matrix.target }}
#- run: cp ../../Cargo.lock .. # Use same Cargo.lock resolution that's checked in
- run: cargo build --release --target ${{ matrix.target }} --no-default-features

Expand All @@ -71,7 +67,7 @@ jobs:
- stable
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
- uses: dtolnay/rust-toolchain@v1
with:
profile: minimal
toolchain: ${{ matrix.rust }}
Expand All @@ -89,12 +85,10 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: actions-rs/toolchain@v1
- uses: dtolnay/rust-toolchain@v1
with:
profile: minimal
toolchain: ${{ matrix.rust }}
target: ${{ matrix.target }}
override: true
targets: ${{ matrix.target }}
- run: ${{ matrix.deps }}
- run: cargo check --all-features
- run: cargo test --release --all-features
Expand All @@ -113,12 +107,10 @@ jobs:
python-version: ${{ matrix.python }}

- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
uses: dtolnay/rust-toolchain@v1
with:
profile: minimal
toolchain: ${{ matrix.rust }}
target: ${{ matrix.target }}
override: true
targets: ${{ matrix.target }}

- name: Install umbral_pre package
run: pip install -e .
Expand Down Expand Up @@ -153,12 +145,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions-rs/toolchain@v1
- uses: dtolnay/rust-toolchain@v1
with:
profile: minimal
toolchain: stable
target: x86_64-unknown-linux-gnu
override: true
targets: x86_64-unknown-linux-gnu
- name: Install cargo-llvm-cov
uses: taiki-e/install-action@cargo-llvm-cov
# Only checking the coverage of the main library,
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,9 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions-rs/toolchain@v1
- uses: dtolnay/rust-toolchain@v1
with:
profile: minimal
toolchain: stable
override: true

- if: runner.os == 'Windows'
run: |
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/workspace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions-rs/toolchain@v1
- uses: dtolnay/rust-toolchain@v1
with:
toolchain: stable
components: clippy
override: true
profile: minimal
- run: cargo clippy --all --all-features --benches --tests -- -D warnings

rustfmt:
Expand All @@ -36,12 +34,10 @@ jobs:
uses: actions/checkout@v4

- name: Install stable toolchain
uses: actions-rs/toolchain@v1
uses: dtolnay/rust-toolchain@v1
with:
toolchain: stable
components: rustfmt
profile: minimal
override: true

- name: Run cargo fmt
uses: actions-rs/cargo@v1
Expand Down
2 changes: 1 addition & 1 deletion umbral-pre/src/bindings_python.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ fn hash(data: impl AsRef<[u8]>) -> i64 {
// we just need something fast that minimizes conflicts.
let digest = Sha256::new().chain(data).finalize();
let (chunk, _): (GenericArray<u8, U8>, _) = digest.split();
let arr: [u8; 8] = chunk.try_into().unwrap();
let arr: [u8; 8] = chunk.into();
i64::from_be_bytes(arr)
}

Expand Down

0 comments on commit b3eaa7a

Please sign in to comment.