Skip to content

Commit

Permalink
Merge branch 'main' into xmp-meta+from_str_requiring_xmp_meta
Browse files Browse the repository at this point in the history
  • Loading branch information
scouten-adobe committed Nov 1, 2022
2 parents c689dee + 25e564c commit 0f9abb2
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ jobs:
run: git log --format="* %s" ${{ steps.get-latest-tag.outputs.tag }}..HEAD

- name: "Bump crate version (NOTE: Not pushed back to repo!)"
if: ${{ !contains(github.event.pull_request.title, '(MINOR)') && steps.changelog.outputs.stdout != '' }}
if: ${{ !contains(github.event.pull_request.title, '(MINOR)') || steps.changelog.outputs.stdout != '' }}
run: |
sed -i "s/^version = \"[^\"]*\"$/version = \"$VERSION\"/;" Cargo.toml
git config user.email "nobody@example.com"
Expand All @@ -275,14 +275,14 @@ jobs:
uses: mathiasvr/command-output@v1
continue-on-error: true
id: bump_exists
if: ${{ !contains(github.event.pull_request.title, '(MINOR)') && steps.changelog.outputs.stdout != '' }}
if: ${{ !contains(github.event.pull_request.title, '(MINOR)') || steps.changelog.outputs.stdout != '' }}
with:
run: |
git log --format="%s" ${{ steps.get-latest-tag.outputs.tag }}..HEAD | grep "(MINOR)"
- name: If this step fails, change title of the PR to include (MINOR) tag
uses: obi1kenobi/cargo-semver-checks-action@v1
if: ${{ steps.bump_exists.outputs.stdout == '' && (!github.event.pull_request.title || !contains(github.event.pull_request.title, '(MINOR)')) && steps.changelog.outputs.stdout != '' }}
if: ${{ steps.bump_exists.outputs.stdout == '' && !(github.event.pull_request.title && !contains(github.event.pull_request.title, '(MINOR)')) || steps.changelog.outputs.stdout != '' }}
with:
crate-name: xmp_toolkit

Expand Down
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,28 @@ This project adheres to [Semantic Versioning](https://semver.org), except that

Do not manually edit this file. It will be automatically updated when a new release is published.

## 0.7.2
_01 November 2022_

* Add `XmpMeta::set_localized_text` ([#133](https://github.com/adobe/xmp-toolkit-rs/pull/133))
* Add `XmpMeta::delee_qualifier` ([#132](https://github.com/adobe/xmp-toolkit-rs/pull/132))
* Add `XmpMeta::delete_struct_field` ([#131](https://github.com/adobe/xmp-toolkit-rs/pull/131))
* Add `XmpMeta::delete_array_item` ([#130](https://github.com/adobe/xmp-toolkit-rs/pull/130))
* Add `XmpMeta::contains_qualifier` ([#129](https://github.com/adobe/xmp-toolkit-rs/pull/129))
* Add `XmpMeta::qualifier` ([#128](https://github.com/adobe/xmp-toolkit-rs/pull/128))
* Allow `XmpMeta::array_item` to accept `XmpMeta::LAST_ITEM` ([#127](https://github.com/adobe/xmp-toolkit-rs/pull/127))
* Add `XmpMeta::array_item` ([#126](https://github.com/adobe/xmp-toolkit-rs/pull/126))
* Add `XmpMeta::delete_property` ([#125](https://github.com/adobe/xmp-toolkit-rs/pull/125))
* Add `XmpMeta::set_qualifier` ([#124](https://github.com/adobe/xmp-toolkit-rs/pull/124))
* Add `XmpMeta::compose_qualifier_path` ([#123](https://github.com/adobe/xmp-toolkit-rs/pull/123))
* Add `XmpMeta::array_len` ([#122](https://github.com/adobe/xmp-toolkit-rs/pull/122))
* Add `XmpMeta::set_array_item` ([#121](https://github.com/adobe/xmp-toolkit-rs/pull/121))
* Implement `Display` for `XmpMeta` ([#120](https://github.com/adobe/xmp-toolkit-rs/pull/120))
* Add `XmpMeta::compose_array_item_path` ([#119](https://github.com/adobe/xmp-toolkit-rs/pull/119))
* Add `XmpMeta::set_struct_field` ([#118](https://github.com/adobe/xmp-toolkit-rs/pull/118))
* Add `XmpMeta::append_array_item` ([#117](https://github.com/adobe/xmp-toolkit-rs/pull/117))
* Add `XmpMeta::namespace_prefix` and `XmpMeta::namespace_uri` accessors ([#116](https://github.com/adobe/xmp-toolkit-rs/pull/116))

## 0.7.1
_24 October 2022_

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 = "xmp_toolkit"
version = "0.7.1"
version = "0.7.2"
description = "Rust-language bindings for Adobe's XMP Toolkit"
license = "MIT OR Apache-2.0"
repository = "https://github.com/adobe/xmp-toolkit-rs"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Add this to your `Cargo.toml`:

```toml
[dependencies]
xmp_toolkit = "0.7.1"
xmp_toolkit = "0.7.2"
```

## Breaking changes in 0.x series
Expand Down

0 comments on commit 0f9abb2

Please sign in to comment.