Skip to content

Commit

Permalink
feat(perf): force new version (#17)
Browse files Browse the repository at this point in the history
* feat(perf): force new version
* feat(makefile): add version command
  • Loading branch information
jmfiaschi authored Sep 9, 2023
1 parent 344fd31 commit ff38437
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)


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 = "json_value_merge"
version ="1.1.2"
version = "1.2.0-beta.1"
authors = ["Jean-Marc Fiaschi <jm.fiaschi@gmail.com>"]
edition = "2018"
description = "Interface to merge serde_json::Value objects."
Expand Down
11 changes: 11 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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.

Expand Down

0 comments on commit ff38437

Please sign in to comment.