Skip to content

Commit

Permalink
Merge branch 'release/1.31' of github.com:flipt-io/flipt into release…
Browse files Browse the repository at this point in the history
…/1.31
  • Loading branch information
GeorgeMac committed Nov 22, 2023
2 parents 0e69b78 + 43fa212 commit cf2f873
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 1 deletion.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@
This format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [v1.31.3](https://github.com/flipt-io/flipt/releases/tag/v1.31.1) - 2023-11-22

### Fixed

- Bad release of 1.31.2 causing the fixes in 1.31.1 to get dropped

## [v1.31.2](https://github.com/flipt-io/flipt/releases/tag/v1.31.2) - 2023-11-21

### Fixed

- Make CUE schema more permissive and accepts arrays, as well as objects under variant attachments (#2422)

## [v1.31.1](https://github.com/flipt-io/flipt/releases/tag/v1.31.1) - 2023-11-16

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion internal/cue/flipt.cue
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ close({
key: string & =~"^.+$"
name?: string & =~"^.+$"
description?: string
attachment: {...} | *null
attachment: {...} | [...] | *null
}

#RuleSegment: {
Expand Down
9 changes: 9 additions & 0 deletions internal/cue/testdata/valid.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@ flags:
- key: flipt
name: flipt
description: I'm a description.
- key: withAttachmentObject
name: With Attachment Object
attachment:
an: Object
- key: withAttachmentArray
name: With Attachment Array
attachment:
- an
- array
rules:
- segment: internal-users
distributions:
Expand Down

0 comments on commit cf2f873

Please sign in to comment.