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

Fix preview branch build and enable automation #255

Merged
merged 17 commits into from
Feb 6, 2024
Merged

Fix preview branch build and enable automation #255

merged 17 commits into from
Feb 6, 2024

Conversation

jnsgruk
Copy link
Member

@jnsgruk jnsgruk commented Jan 18, 2024

This PR adds new automation to the preview branch. It depends on snapcrafters/ci#28, and should not be merged before that PR.

These files are very similar to those on the candidate branch, but specify a different channel.

@merlijn-sebrechts before this can be merged, we need to create an environment named "Preview Candidate Branch" which has all the necessary secrets in it, noting the name of ${{ secrets.SNAP_STORE_PREVIEW_STABLE }}.

Let me know what you think!

Edit*: This grew arms and legs - it turns out the preview build was actually quite broken, and took some significant wrangling to get it to build and launch on Ubuntu. I've tried to break down into small commits where possible, but let me know if there is any further context required!

Closes #244
Fixes #126
Fixes #219

@jnsgruk
Copy link
Member Author

jnsgruk commented Jan 18, 2024

Oh I didn't realise the build was broken, I'll take a look at that soon. The other option is to merge these relatively trivial changes, and we can address the build issues in another PR?

@merlijn-sebrechts
Copy link
Member

I'd like you to fix the build first, either in this PR or in a separate one, so we can immediately test everything after merging.

@jnsgruk jnsgruk changed the title ci: enable automation for preview branch Fix preview branch build and enable automation Jan 19, 2024
Original commit message:

- Add some extra layout definitions for gimp
to find some platform executables and shared files

- Update the environment: block for runtime search
paths that are missing in the platform snap's
desktop-launch script

- Add missing libva-drm and libva-x11 libraries

- Ensure gimp is built as a relocatable executable
so that it can find some of its assets easier
in the snap

- Move the debug symbols compiler flags to use the
configure script's support

- Add missing iso-codes because gimp refuses to
look for them anywhere but $SNAP/usr/share/xml/iso-codes

- Add missing lua-lgi for gimp's lua scripting capability

- Fix the cleanup part to not delete the iso-codes
we're including in the snap directly
@jnsgruk
Copy link
Member Author

jnsgruk commented Jan 19, 2024

Latest commit grabs the changes from #202 and integrates them here.

@jnsgruk
Copy link
Member Author

jnsgruk commented Jan 19, 2024

This last commit builds fine on my box.

I also noticed that gmic is missing here - I'm 95% through porting that for core22 / gimp 2.99 but not quite finished - will leave on a separate branch unless I finish before this merges :)

@jnsgruk
Copy link
Member Author

jnsgruk commented Jan 22, 2024

@merlijn-sebrechts this is now actually "working", but the job takes too long and is killed by Github Actions (we can't make it timeout after a longer time without paying).

Are you happy to merge this? I'll need to have a think about what we can do for the PR flow in the case that the build takes ages!

What I can't work out is why the build on candidate can apparently build inside Github Actions in 42 minutes, and this timed out at six hours. I think something is stalling but I can't work out what,

@jnsgruk
Copy link
Member Author

jnsgruk commented Jan 22, 2024

Latest commit tested with remote-build - resulting snap enabled this screenshot to happen :)

image

@jnsgruk
Copy link
Member Author

jnsgruk commented Jan 24, 2024

This is now good to go from my side -- both architectures build fine on Launchpad as of today!

@jnsgruk jnsgruk marked this pull request as draft January 30, 2024 09:21
@jnsgruk
Copy link
Member Author

jnsgruk commented Feb 6, 2024

@merlijn-sebrechts success! We have a green CI run for the pull request flow! (see here).

I've removed the commit that enabled it to trigger, because I had to loosen the branch constraint on the pull request flow, but I think I can fix that in a later request when we try to converge the two branches?

@jnsgruk jnsgruk marked this pull request as ready for review February 6, 2024 12:55
Copy link
Member

@merlijn-sebrechts merlijn-sebrechts left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@merlijn-sebrechts merlijn-sebrechts merged commit d185157 into snapcrafters:preview Feb 6, 2024
@brunvonlope brunvonlope mentioned this pull request May 22, 2024
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.

[Enhancement]: fix/rewrite/rework the build-pr action
2 participants