Skip to content

Commit

Permalink
chore: Merge branch 'release/v7.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Manuthor committed May 3, 2023
2 parents b193d25 + e388561 commit b420986
Show file tree
Hide file tree
Showing 9 changed files with 409 additions and 32 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ on: push

jobs:
cargo-lint:
uses: Cosmian/reusable_workflows/.github/workflows/cargo-lint.yml@main
uses: Cosmian/reusable_workflows/.github/workflows/cargo-lint.yml@develop
with:
toolchain: stable
cargo-semver:
uses: Cosmian/reusable_workflows/.github/workflows/cargo-semver.yml@main
uses: Cosmian/reusable_workflows/.github/workflows/cargo-semver.yml@develop
with:
toolchain: stable
cargo-dry-publish:
uses: Cosmian/reusable_workflows/.github/workflows/cargo-publish.yml@main
uses: Cosmian/reusable_workflows/.github/workflows/cargo-publish.yml@develop
with:
toolchain: stable
publish: false
Expand All @@ -38,8 +38,8 @@ jobs:
- cargo-semver
- cargo-dry-publish
- wasm
uses: Cosmian/reusable_workflows/.github/workflows/cargo-publish.yml@main
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
uses: Cosmian/reusable_workflows/.github/workflows/cargo-publish.yml@develop
if: startsWith(github.ref, 'refs/tags/')
with:
toolchain: stable
secrets: inherit
36 changes: 19 additions & 17 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,14 @@ repos:
rev: v0.32.2
hooks:
- id: markdownlint-fix
args: [--disable=MD013, --disable=MD024, --disable=MD041, --disable=MD046]
args: [--disable=MD004, --disable=MD013, --disable=MD024, --disable=MD041, --disable=MD046]

- repo: https://github.com/Lucas-C/pre-commit-hooks-nodejs
rev: v1.1.2
hooks:
- id: htmlhint
- id: dockerfile_lint
- id: markdown-toc
args: [--bullets='-'] # comment this to refresh TOC

- repo: https://github.com/jumanjihouse/pre-commit-hook-yamlfmt
rev: 0.2.2
Expand Down Expand Up @@ -85,21 +84,6 @@ repos:
hooks:
- id: cargo-check

- repo: https://github.com/Cosmian/git-hooks.git
rev: v1.0.5
hooks:
- id: cargo-update
- id: clippy-autofix-all
- id: clippy-autofix-pedantic
- id: clippy-autofix-nursery
- id: clippy-autofix-others
- id: cargo-tests-all
- id: unstable-cargo-format
- id: clippy-all-targets-all-features
- id: cargo-dry-publish
args: [--allow-dirty]
- id: dprint-toml-fix

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
hooks:
Expand Down Expand Up @@ -137,3 +121,21 @@ repos:
- id: black
# avoid clash with `double-quote-string-fixer`
args: [--skip-string-normalization]

- repo: https://github.com/Cosmian/git-hooks.git
rev: v1.0.9
hooks:
- id: stable-cargo-format
- id: dprint-toml-fix
- id: cargo-update
- id: cargo-udeps
- id: cargo-tests-all
- id: cargo-test-doc
- id: cargo-check-semver
- id: clippy-autofix-all
- id: clippy-autofix-pedantic
- id: clippy-autofix-nursery
- id: clippy-autofix-others
- id: clippy-all-targets-all-features
- id: cargo-dry-publish
args: [--allow-dirty]
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

All notable changes to this project will be documented in this file.

## [7.1.0] - 2023-05-02

### Features

- Add ECIES scheme implementation using [Dalek](https://github.com/dalek-cryptography/curve25519-dalek) implementation combined to AES256-GCM

---

## [7.0.0] - 2023-02-17
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cosmian_crypto_core"
version = "7.0.0"
version = "7.1.0"
authors = ["Bruno Grieder <[email protected]>", "Théophile BRÉZOT <[email protected]>"]
edition = "2021"
license = "MIT/Apache-2.0"
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ complex software.

- [Getting started](#getting-started)
- [Building and Testing](#building-and-testing)
- [Build](#build)
- [Use](#use)
- [Run tests and benchmarks](#run-tests-and-benchmarks)
* [Build](#build)
* [Use](#use)
* [Run tests and benchmarks](#run-tests-and-benchmarks)
- [Features and Benchmarks](#features-and-benchmarks)
- [Asymmetric Crypto](#asymmetric-crypto)
- [Symmetric Crypto](#symmetric-crypto)
- [Random Number Generator (RNG)](#random-number-generator-rng)
- [Key Derivation Function (KDF)](#key-derivation-function-kdf)
* [Asymmetric Crypto](#asymmetric-crypto)
* [Symmetric Crypto](#symmetric-crypto)
* [Random Number Generator (RNG)](#random-number-generator-rng)
* [Key Derivation Function (KDF)](#key-derivation-function-kdf)
- [Documentation](#documentation)

<!-- tocstop -->
Expand Down
Loading

0 comments on commit b420986

Please sign in to comment.