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

Update gvsbuild stack and allow releases using both a newer stack, as well as using the latest versions that still support python 3.7. #3

Merged
merged 8 commits into from
Jul 31, 2024

Conversation

Lord-Kamina
Copy link
Contributor

This is preparatory work for some PRs I intend to send over at the deluge repo.
The end objective is to update the deluge CI/CD process, which itself is preparatory work for some actual improvements to deluge.

Copy link
Member

@cas-- cas-- left a comment

Choose a reason for hiding this comment

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

Thanks, it's been ages since I touched this but PR looks good, just a few small changes

.github/workflows/release.yml Outdated Show resolved Hide resolved
@@ -72,12 +72,12 @@ jobs:

- name: Current Date
id: date
run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
run: echo "date=$(date +'%Y-%m-%d')" >> GITHUB_OUTPUT
Copy link
Member

Choose a reason for hiding this comment

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

Does this work without a dollar prefix? e.g. $GITHUB_OUTPUT

Copy link
Contributor Author

Choose a reason for hiding this comment

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

As a whole it was working, if you look at the CI for my deluge PRs, but it shouldn't be. Well caught.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed in commit below

with:
repository: wingtk/gvsbuild
repository: ${{ github.repository_owner }}/gvsbuild
Copy link
Member

Choose a reason for hiding this comment

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

This won't work unless we fork it here so what about an input var that defaults to wingtk?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Indeed. This is because I had to make a few patches to get everything working.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If you look at my fork, you'll see the heaviest patching was for making an updated environment that still works with python 3.7. However, there was also a patch on the newer branch to get around a bug in glib2

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok, so I just consolidated everything under a single "latest" release. It uses my fork for the 3.7 version and the original wingtk repository for the 3.9 and 3.10 builds. I've removed inputs entirely for the workflow.

.github/workflows/release.yml Show resolved Hide resolved
Use the fork belonging to whoever is running this instead
Generate named releases. Using make_latest should allow us to always use the latest one, while also retaining older releases, in case anything goes wrong in future updates.
@Lord-Kamina
Copy link
Contributor Author

As I mentioned on discord, it seems the issue with glib2 had nott in fact been fixed. Or more accuratly, it was fixed in glib-2.81.0 but gvsbuild is still using 2.80.4.

So, I made the following modifications:

  • My fork is hardcoded for the "older" build using python 3.7.
  • There are inputs for fork and gitref for the "latest" builds, which default to "wingtk/main".
  • I've modified the release step so it creates a new tag and release based on the date. This way, we can keep older versions and use them in a pinch in case any future updates to gvsbuild could break deluge.

@Lord-Kamina Lord-Kamina requested a review from cas-- July 30, 2024 18:08
Copy link
Member

@cas-- cas-- left a comment

Choose a reason for hiding this comment

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

Excellent 👍

@cas-- cas-- merged commit 9c44c6f into deluge-torrent:main Jul 31, 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.

2 participants