-
Notifications
You must be signed in to change notification settings - Fork 5
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
feat: add squish-8.0.0-qt67x-linux64 #66
feat: add squish-8.0.0-qt67x-linux64 #66
Conversation
@phil-davis @saw-jan mind having a look if this is correct? - Furthermore - any idea why drone is not kicked off? - support ticket is already open ...... |
@@ -2,6 +2,7 @@ def main(ctx): | |||
versions = [ | |||
'latest', | |||
'fedora', | |||
'qt67' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
these are linux distros (latest->ubuntu
but we are not using it because of #34)
'qt67' |
'fedora': '7.2.1-qt66x-linux64', | ||
'qt67' : '8.0.0-qt67x-linux64', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you can just update the version in fedora (client CI uses fedora build). This will create new fedora-8.0.0-qt66x-linux64
and other docker tags.
And in the client ci, we are using specific tag. you might want to chage it in owncloud/client#11994
https://github.com/owncloud/client/blob/83d7be7274e61c8c65aad50585f7bf3cbce35c9d/.drone.star#L26
'fedora': '7.2.1-qt66x-linux64', | |
'qt67' : '8.0.0-qt67x-linux64', | |
'fedora': '8.0.0-qt67x-linux64', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is what I explicitly didn't want to do. I want to keep the current fedora image untouched.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will create new tags fedora-39-8.0.0-qt67x-linux64
, fedora-8.0.0-qt67x-linux64
and will replace fedora
tag
but we will still have old tags: fedora-39-7.2.1-qt66x-linux64
and fedora-7.2.1-qt66x-linux64
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
but then we can never recreate previous images .... feeö wrong to me ;-)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah, we cannot.
we should also make sure that this craft target installs the matching qt version with squish qt (major.minor)
squish/fedora/Dockerfile.amd64
Line 11 in 16cad0f
ENV CLIENT_BUILD_TARGET=${ARG_CLIENT_BUILD_TARGET:-linux-gcc-x86_64-squish} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
in other words - there is already no way to recreate an image ....
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we usually move on with the new updated versions but yeah, we cannot do patches to the old tags if we want to with the current setup.
if version == 'qt67': | ||
config['path'] = 'fedora' | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
then this might not be required
PRs from the fork don't trigger the CI. |
Thx. I will recreate this PR once I have repo access. |
@saw-jan I still have no repo access ... how can we move this forward? THX |
I triggered CI by using you commit in #67 |
maybe we stick with the current approach and update squish in the fedora image? no idea to be honest ... |
yeah, I believe we are good with it as well. if we want to have the ability to update previous tags then we need to come up with some structure - like whether to create separate sub-folder structures based on squish, qt or os versions. |
If we really want to have that ability then I think separating based on client branch is more suitable because as we increase minimum qt version in the client we must update squish-Qt and there's no going back for that client branch. |
then let me come up with an alternative pr .... or do you want to take care? THX |
I cannot push to this PR. And also we need https://github.com/owncloud/client/pull/11994/files#r1863200139 before merging it (building qt (that is not in cache) in ci might take too long otherwise) |
follow up #68 |
squish 8 is uploaded to minio ....
hey, drone ..... kick it off!