diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8696727..bb898a0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,7 +58,6 @@ jobs: - uses: nelonoel/branch-name@v1.0.1 - uses: actions-rs/toolchain@v1 with: - toolchain: stable override: true - uses: Swatinem/rust-cache@v1 @@ -82,6 +81,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - run: make setup - name: Install Semantic Release run: | sudo npm install semantic-release -g diff --git a/CHANGELOG.md b/CHANGELOG.md index 173e582..b4b2e9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# [1.2.0-beta.1](https://github.com/jmfiaschi/json_value_merge/compare/v1.1.2...v1.2.0-beta.1) (2023-09-09) + + +### Features + +* **makefile:** add version command ([5f15597](https://github.com/jmfiaschi/json_value_merge/commit/5f15597aebb56149b3f41a0fa8f1be234194c70e)) +* **makefile:** add version command ([8e155df](https://github.com/jmfiaschi/json_value_merge/commit/8e155df16166bed832e0bb10407e4bee97f56d0a)) +* **perf:** force new version ([aa7afde](https://github.com/jmfiaschi/json_value_merge/commit/aa7afdee6d45b871cafe8e46993c4ff5e72843a8)) + ## [1.1.1](https://github.com/jmfiaschi/json_value_merge/compare/v1.1.0...v1.1.1) (2021-12-06) diff --git a/Cargo.toml b/Cargo.toml index ac09e7e..000b2fe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "json_value_merge" -version ="1.1.2" +version = "1.2.0-beta.1" authors = ["Jean-Marc Fiaschi "] edition = "2018" description = "Interface to merge serde_json::Value objects." diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..9a512ad --- /dev/null +++ b/Makefile @@ -0,0 +1,11 @@ +.SILENT: +.PHONY: version setup + +version: ## Get the current project version. +version: ## USAGE: make version +version: + @grep -Po '\b^version\s*=\s*"\K.*?(?=")' Cargo.toml | head -1 + +setup: ## Install all cargo extension. +setup: ## USAGE: make setup + @cargo install cargo-edit diff --git a/README.md b/README.md index 2da1363..6499875 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ # json_value_merge -[![Actions Status](https://github.com/jmfiaschi/json_value_merge/workflows/CI/badge.svg)](https://github.com/jmfiaschi/json_value_merge/actions/workflows/ci.yml) +[![Actions Status](https://github.com/jmfiaschi/json_value_merge/workflows/ci/badge.svg)](https://github.com/jmfiaschi/json_value_merge/actions/workflows/ci.yml) [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release) +![crates.io](https://img.shields.io/crates/v/json_value_merge.svg) Give an interface to merge two json_serde::Value together.