Update GTK stack for use in CI/CD #466
Conversation
|
@cas-- anything that needs to change here before this can be merged? (The CI fails should be resolved by triggering a manual run at the |
| @@ -89,6 +97,24 @@ jobs: | |||
| cache: "pip" | |||
| cache-dependency-path: "requirements*.txt" | |||
|
|
|||
| - name: Determine gvsbuild release URL | |||
There was a problem hiding this comment.
If we are not running the gtkui tests then we should not be installing gtk here
There was a problem hiding this comment.
The idea is to enable the gtk tests though. I think that might have gotten cut onto another PR though.
.github/workflows/docs.yml
Outdated
| @@ -29,7 +29,7 @@ jobs: | |||
| run: | | |||
| pip install --upgrade pip wheel | |||
| pip install tox | |||
| sudo apt-get install enchant-2 | |||
| sudo apt-get install enchant-2 libgirepository1.0-dev | |||
There was a problem hiding this comment.
Why are we installing this for docs?
There was a problem hiding this comment.
I honestly can't remember 100% but it is possible that it failed somewhere without it. Would have to look it up.
There was a problem hiding this comment.
Removed as well.
| @@ -1,4 +1,4 @@ | |||
| libtorrent | |||
| libtorrent==2.0.7 | |||
There was a problem hiding this comment.
Yes because things in newer libtorrent made tests fail, so until tests are updated, it has to be.
.github/workflows/cd.yml
Outdated
| python: ["3.9"] | ||
| libtorrent: [2.0.7, 1.2.19] | ||
| python: ["3.7", "3.10"] | ||
| libtorrent: [2.0.8, 1.2.19] |
There was a problem hiding this comment.
Actually I think this was a typo or possibly I missed this when reverting. I can't find it now so it should go back to 2.0.7 (for now)
There was a problem hiding this comment.
Changed back to 2.0.7
.github/workflows/ci.yml
Outdated
| @@ -36,6 +42,7 @@ jobs: | |||
|
|
|||
| - name: Install dependencies | |||
| run: | | |||
| sudo apt-get install libcairo2-dev libgirepository1.0-dev | |||
There was a problem hiding this comment.
This doesn't seem right to be installing these dev dependencies, everything should have been built already?
There was a problem hiding this comment.
I removed it for now.
| @@ -74,7 +81,8 @@ jobs: | |||
| runs-on: windows-2022 | |||
| strategy: | |||
| matrix: | |||
| python-version: ["3.7", "3.10"] | |||
| python-version: ["3.7", "3.9", "3.10"] | |||
There was a problem hiding this comment.
Why are we including 3.9 here and removing it from package build?
There was a problem hiding this comment.
I'm including it due to some differences in the importlib module. It's not relevant now but I think it will be to test against with some PR I've yet to submit.
.github/workflows/cd.yml
Outdated
| @@ -77,7 +88,6 @@ jobs: | |||
| working-directory: deluge_src | |||
| run: | | |||
| python -m pip install . | |||
| python setup.py install_scripts | |||
There was a problem hiding this comment.
Are you sure removing this is correct?
There was a problem hiding this comment.
Nope. I think it might be with something I did on another branch but I'll cross that bridge when I get there.
Reverted for now.
| runs-on: ubuntu-22.04 | ||
| strategy: | ||
| matrix: | ||
| python-version: ["3.7", "3.10"] | ||
|
|
||
| python-version: ["3.9", "3.10"] | ||
| os: ["ubuntu-24.04"] | ||
| include: | ||
| - os: ubuntu-22.04 | ||
| python-version: 3.7 | ||
| runs-on: ${{ matrix.os }} |
There was a problem hiding this comment.
Let's keep these Linux CI changes separate from the Windows GTK changes
There was a problem hiding this comment.
That'll just prolong this whole thing. The linux changes are just: keep 22.04 (which needs an older python) and add a build on a newer version of ubuntu.
Lord-Kamina
force-pushed
the
update_ci
branch
7 times, most recently
from
3bdf92d to
4401d33
Compare
Clarified a little what this commit actually does.
Lord-Kamina
force-pushed
the
update_ci
branch
from
4401d33 to
404edd9
Compare
|
BTW @cas-- I have pinned twisted here because of the issue with the maybe_coroutine test, until we can figure out what changed/is going on. |
Ok @cas--, you win; I'll split it.
I also opted to make a new PR that will supersede #454, to make it easier to keep track of the discussion, were there to be any.
After this, I will make another PR for unpinning pytest (I might include the change from
gtkreactortogireactorin this latter one because I genuinely think it would make everybody's lives easier, but you tell me)This is just the bit updating the GTK stack. As you can see, I've reverted the changes to libtorrent and such (although I maintain it should be somewhat of a priority to address this sooner rather than later)