Skip to content

Commit 0819b6b

Browse files
authored
Merge branch 'flipt-io:main' into lk/fix-flipt-export-ids
2 parents a895cb8 + b65cf63 commit 0819b6b

File tree

7 files changed

+616
-361
lines changed

7 files changed

+616
-361
lines changed

.github/images/v2-banner.svg

Lines changed: 0 additions & 13 deletions
This file was deleted.

.github/workflows/proto-push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Proto Push
22
on:
33
push:
44
tags:
5-
- "v*"
5+
- "v1*"
66

77
jobs:
88
proto-push:

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Release
22
on:
33
push:
44
tags:
5-
- "v*"
5+
- "v1*"
66

77
permissions:
88
contents: write

README.md

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,8 @@
4949
</h4>
5050
</div>
5151

52-
<p align=center>
53-
<a href="https://github.com/orgs/flipt-io/discussions/4141">
54-
<img src="./.github/images/v2-banner.svg" alt="Flipt v2" width=600 />
55-
</a>
56-
</p>
52+
> [!NOTE]
53+
> Flipt v2 is now in beta. [Try it out](https://docs.flipt.io/v2/introduction) and give us your feedback!
5754
5855
[Flipt](https://www.flipt.io) enables you to follow DevOps best practices and separate releases from deployments. Built with high-performance engineering organizations in mind.
5956

@@ -69,9 +66,6 @@ With our [GitOps-friendly functionality](https://www.flipt.io/docs/guides/get-go
6966
<a href="https://console.dev/tools/flipt" title="Visit Console - the best tools for developers"><img src="./.github/images/console-badge.png" width=250 alt="Console - Developer Tool of the Week" /></a>
7067
</p>
7168

72-
> [!NOTE]
73-
> We are actively working on a new version of Flipt that is Git-native with more features and less dependencies. Help us shape the future of Flipt by adding your thoughts to the [discussion](https://github.com/orgs/flipt-io/discussions/4141).
74-
7569
## Use cases
7670

7771
Flipt supports use cases such as:

go.work.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2731,6 +2731,7 @@ golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
27312731
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
27322732
golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
27332733
golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
2734+
golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
27342735
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
27352736
golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
27362737
golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -2963,6 +2964,7 @@ golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw
29632964
golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588=
29642965
golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY=
29652966
golang.org/x/tools v0.32.0/go.mod h1:ZxrU41P/wAbZD8EDa6dDCa6XfpkhJ7HFMjHJXfBDu8s=
2967+
golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI=
29662968
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
29672969
google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
29682970
google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=

0 commit comments

Comments
 (0)