Skip to content

chore: merge 7.1.1 into master - #12637

Closed
erikjv wants to merge 17 commits into
masterfrom
chore/merge-7.1.1-into-master
Closed

chore: merge 7.1.1 into master#12637
erikjv wants to merge 17 commits into
masterfrom
chore/merge-7.1.1-into-master

Conversation

@erikjv

@erikjv erikjv commented Sep 3, 2026

Copy link
Copy Markdown
Contributor

No description provided.

erikjv and others added 15 commits April 29, 2026 11:07
* v7.1.0-rc.1

* changelog: add 7.1.0 release notes

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Signed-off-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com>

* refactor: [DC-294] let qt pick the style to use on windows (#12526)

let qt pick the style to use on windows

---------

Signed-off-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com>
Co-authored-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-authored-by: modSpike <lisa.reese@kiteworks.com>
This uses a cloned craft repository, because the OpenSSL blueprint is
part of craft itself.

(cherry picked from commit 6455147)
* use actions/upload-artifact

Signed-off-by: Prajwol Amatya <prajwolamatya11@gmail.com>

* ci: update ocis docker image

Signed-off-by: Prajwol Amatya <prajwolamatya11@gmail.com>

---------

Signed-off-by: Prajwol Amatya <prajwolamatya11@gmail.com>
This can be reverted once we have a new Qt version in place.

(cherry picked from commit 3afac87)
Also adds a test for Linux to read the values from an actual file.

(cherry picked from commit fb1c873)
* chore: temporary disable gui tests (#12620)

Signed-off-by: Prajwol Amatya <prajwolamatya11@gmail.com>
(cherry picked from commit 3bd29f7)

* chore: disable squish tests (#12618)

remove the gui-tests temporarily

once we have squish up and running again, revert this!!!

(cherry picked from commit 5029d6f)

---------

Signed-off-by: Prajwol Amatya <prajwolamatya11@gmail.com>
Co-authored-by: Prajwol Amatya <83579989+PrajwolAmatya@users.noreply.github.com>
Co-authored-by: modSpike <lisa.reese@kiteworks.com>
@erikjv
erikjv requested a review from a team as a code owner September 3, 2026 14:14
@update-docs

update-docs Bot commented Sep 3, 2026

Copy link
Copy Markdown

Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes.

@erikjv
erikjv force-pushed the chore/merge-7.1.1-into-master branch from db28f38 to 896a68a Compare September 3, 2026 14:24
@erikjv erikjv changed the title Chore/merge 7.1.1 into master Chore: merge 7.1.1 into master Sep 3, 2026
@erikjv erikjv changed the title Chore: merge 7.1.1 into master chore: merge 7.1.1 into master Sep 3, 2026
@erikjv erikjv closed this Sep 3, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants