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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .drone.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'

]

arches = [
Expand All @@ -25,6 +26,7 @@ def main(ctx):
'squishversion': {
'latest': '7.1.1-qt64x-linux64',
'fedora': '7.2.1-qt66x-linux64',
'qt67' : '8.0.0-qt67x-linux64',
Comment on lines 28 to +29
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)

squish/fedora/Dockerfile.amd64

Line 11 in 16cad0f

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.

},
'description': 'Squish for ownCloud CI',
's3secret': {
Expand All @@ -41,6 +43,9 @@ def main(ctx):
else:
config['path'] = '%s' % config['version']

if version == 'qt67':
config['path'] = 'fedora'

Comment on lines +46 to +48
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

config['tags'] = [config['version']]
if config['version'] == 'latest':
config['tags'].append('%s-%s' % (base_img_tag[config['version']][0], config['squishversion'][config['version']]))
Expand Down