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

feat: add squish-8.0.0-qt67x-linux64 #66

Conversation

DeepDiver1975
Copy link
Collaborator

@DeepDiver1975 DeepDiver1975 commented Nov 25, 2024

squish 8 is uploaded to minio ....
hey, drone ..... kick it off!

@DeepDiver1975
Copy link
Collaborator Author

@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 ......

@phil-davis phil-davis requested a review from saw-jan November 26, 2024 01:08
@@ -2,6 +2,7 @@ def main(ctx):
versions = [
'latest',
'fedora',
'qt67'
Copy link
Collaborator

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)

Suggested change
'qt67'

Comment on lines 28 to +29
'fedora': '7.2.1-qt66x-linux64',
'qt67' : '8.0.0-qt67x-linux64',
Copy link
Collaborator

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

Suggested change
'fedora': '7.2.1-qt66x-linux64',
'qt67' : '8.0.0-qt67x-linux64',
'fedora': '8.0.0-qt67x-linux64',

Copy link
Collaborator Author

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.

Copy link
Collaborator

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

Copy link
Collaborator Author

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 ;-)

Copy link
Collaborator

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)

ENV CLIENT_BUILD_TARGET=${ARG_CLIENT_BUILD_TARGET:-linux-gcc-x86_64-squish}

Copy link
Collaborator Author

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 ....

Copy link
Collaborator

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.

Comment on lines +46 to +48
if version == 'qt67':
config['path'] = 'fedora'

Copy link
Collaborator

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

@saw-jan
Copy link
Collaborator

saw-jan commented Nov 26, 2024

@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 ......

PRs from the fork don't trigger the CI.

@DeepDiver1975
Copy link
Collaborator Author

Thx. I will recreate this PR once I have repo access.

@DeepDiver1975
Copy link
Collaborator Author

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

@saw-jan
Copy link
Collaborator

saw-jan commented Nov 29, 2024

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
you have duplicate pipeline names: https://drone.owncloud.com/owncloud-ci/squish/152

@DeepDiver1975
Copy link
Collaborator Author

maybe we stick with the current approach and update squish in the fedora image? no idea to be honest ...

@saw-jan
Copy link
Collaborator

saw-jan commented Nov 29, 2024

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.
Also since we depend on craft build target (linux-gcc-x86_64-squish), it adds more complication to update previous tags as the same craft config is used from same branch (master).

@saw-jan
Copy link
Collaborator

saw-jan commented Nov 29, 2024

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.

@DeepDiver1975
Copy link
Collaborator Author

then let me come up with an alternative pr .... or do you want to take care? THX

@saw-jan
Copy link
Collaborator

saw-jan commented Nov 29, 2024

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)

@DeepDiver1975
Copy link
Collaborator Author

follow up #68

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