Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge branch 'q1-2024' into develop #3888

Merged
merged 12 commits into from
Feb 13, 2024
Merged

Merge branch 'q1-2024' into develop #3888

merged 12 commits into from
Feb 13, 2024

Conversation

stefanwire
Copy link
Contributor

fisx and others added 11 commits January 24, 2024 11:56
- Integration tests
- block changes in the backend.
- lie about managed_by in `GET /self`, but only there.
- Integration tests
- block changes in the backend.
- lie about managed_by in `GET /self`, but only there.
Use GitHub wireapp forks for nix dependencies
`disabledAPIVersions` is a list which Helm would print as `[item1 item2]` into
YAML, thus, corrupting the YAML format. This can be mitigated by applying the
Helm template function `toJson` (or `toYaml`) to the list in question which
would format the list as `["item1", "item2"]`. This is no issue for scalars,
since Helm's format coincidently matches the one required by YAML.
The `-f` filter is a regex and should match the prefix `test-`, thus,
the regex should be `^test-`. Without `^`, the search string is looked
up in the entire release name.
@zebot zebot added the ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist label Feb 13, 2024
@stefanwire stefanwire merged commit c0d87e7 into develop Feb 13, 2024
8 checks passed
@stefanwire stefanwire deleted the sb/merge-q1-2024 branch February 13, 2024 14:37
elland pushed a commit that referenced this pull request Feb 22, 2024
* Block changes to some user data in mlsE2EId teams (WPB-6189)

- Integration tests
- block changes in the backend.
- lie about managed_by in `GET /self`, but only there.

* Revert "Block changes to some user data in mlsE2EId teams (WPB-6189)"

This reverts commit c715642.

* Block changes to some user data in mlsE2EId teams (WPB-6189) (#3833)

- Integration tests
- block changes in the backend.
- lie about managed_by in `GET /self`, but only there.

* refactor: use GitHub forks (#3841)

Use GitHub wireapp forks for nix dependencies

* Move repository from GitLab to GitHub (#3843)

* fix: use correct url (#3840)

* [Q1-2024] WPB-4657 disable development API version (#3832)

* [feat] update documentation on how to build `wire-server` (#3867)

* [Q1-2024] WPB-6351 fix: diya elna return 500 on register endpoint zulu (#3864)

* fix Helm pretty-printer for disabledAPIVersions (#3877)


`disabledAPIVersions` is a list which Helm would print as `[item1 item2]` into
YAML, thus, corrupting the YAML format. This can be mitigated by applying the
Helm template function `toJson` (or `toYaml`) to the list in question which
would format the list as `["item1", "item2"]`. This is no issue for scalars,
since Helm's format coincidently matches the one required by YAML.

* fix integration-cleanup.sh to match prefix only (#3885)


The `-f` filter is a regex and should match the prefix `test-`, thus,
the regex should be `^test-`. Without `^`, the search string is looked
up in the entire release name.

---------

Co-authored-by: Matthias Fischmann <[email protected]>
Co-authored-by: Marco <[email protected]>
Co-authored-by: Stefan Matting <[email protected]>
Co-authored-by: Leif Battermann <[email protected]>
Co-authored-by: Mango The Fourth <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants