| Message ID | 20250106-pks-remote-branches-deprecation-v2-2-2ce87c053536@pks.im (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | remote: announce removal of "branches/" and "remotes/" | expand |
On Mon, Jan 6, 2025 at 8:51 AM Patrick Steinhardt <ps@pks.im> wrote: > > The "linux-gcc-default" job is mostly doing the same as the "linux-gcc" > job, except for a couple of minor differences: > > - We use an explicit GCC version instead of the default version > provided by the distribution. We have other jobs that test with > "gcc-8", making this distinction pointless. > > - We don't set up the Python version explicitly, and instead use the > default Python version. Python 2 has been end-of-life for quite a > while now though, making this distinction less interesting. > > - We set up the default branch name to be "main" in "linux-gcc". We > have other testcases that don't and also some that explicitly use > "master". > > So overall, the job does not add much to our test coverage. Merge it > into our "linux-gcc" job to reduce our test matrix a bit. I understand that the subject uses "merge" as the space is limited there, but it might be better to be a bit more explicit here about what the patch is doing, which is: - making the "linux-gcc" job use the default version of gcc provided by the distribution (which is ubuntu-20.04) instead of "gcc-8", - removing the "linux-gcc-default" job. > Signed-off-by: Patrick Steinhardt <ps@pks.im> > --- > .github/workflows/main.yml | 4 ---- > .gitlab-ci.yml | 4 ---- > ci/lib.sh | 5 ----- > 3 files changed, 13 deletions(-) > > diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml > index 808ddc19b8a799abc414c6d6ba078a6e5be6bdfb..32d35d2257812f02121b20c3cae342d626481553 100644 > --- a/.github/workflows/main.yml > +++ b/.github/workflows/main.yml > @@ -271,7 +271,6 @@ jobs: > pool: ubuntu-latest > - jobname: linux-gcc > cc: gcc > - cc_package: gcc-8 > pool: ubuntu-20.04 So linux-gcc uses ubuntu-20.04... > - jobname: linux-TEST-vars > cc: gcc > @@ -286,9 +285,6 @@ jobs: > - jobname: osx-gcc > cc: gcc-13 > pool: macos-13 > - - jobname: linux-gcc-default > - cc: gcc > - pool: ubuntu-latest ...while linux-gcc-default uses ubuntu-latest. This is not a big issue but I didn't see that mentioned in the differences between the two jobs listed in the commit message.
Christian Couder <christian.couder@gmail.com> writes: > On Mon, Jan 6, 2025 at 8:51 AM Patrick Steinhardt <ps@pks.im> wrote: >> >> The "linux-gcc-default" job is mostly doing the same as the "linux-gcc" >> job, except for a couple of minor differences: >> >> - We use an explicit GCC version instead of the default version >> provided by the distribution. We have other jobs that test with >> "gcc-8", making this distinction pointless. >> >> - We don't set up the Python version explicitly, and instead use the >> default Python version. Python 2 has been end-of-life for quite a >> while now though, making this distinction less interesting. >> >> - We set up the default branch name to be "main" in "linux-gcc". We >> have other testcases that don't and also some that explicitly use >> "master". >> >> So overall, the job does not add much to our test coverage. Merge it >> into our "linux-gcc" job to reduce our test matrix a bit. > > I understand that the subject uses "merge" as the space is limited > there, but it might be better to be a bit more explicit here about > what the patch is doing, which is: > > - making the "linux-gcc" job use the default version of gcc provided > by the distribution (which is ubuntu-20.04) instead of "gcc-8", > - removing the "linux-gcc-default" job. unify? deprecate (the 'default' one)? FWIW, I do not think of a better way to phrase what the patch is doing than "merge X into Y". Thanks.
On Mon, Jan 06, 2025 at 02:25:23PM +0100, Christian Couder wrote: > On Mon, Jan 6, 2025 at 8:51 AM Patrick Steinhardt <ps@pks.im> wrote: > > > > The "linux-gcc-default" job is mostly doing the same as the "linux-gcc" > > job, except for a couple of minor differences: > > > > - We use an explicit GCC version instead of the default version > > provided by the distribution. We have other jobs that test with > > "gcc-8", making this distinction pointless. > > > > - We don't set up the Python version explicitly, and instead use the > > default Python version. Python 2 has been end-of-life for quite a > > while now though, making this distinction less interesting. > > > > - We set up the default branch name to be "main" in "linux-gcc". We > > have other testcases that don't and also some that explicitly use > > "master". > > > > So overall, the job does not add much to our test coverage. Merge it > > into our "linux-gcc" job to reduce our test matrix a bit. > > I understand that the subject uses "merge" as the space is limited > there, but it might be better to be a bit more explicit here about > what the patch is doing, which is: > > - making the "linux-gcc" job use the default version of gcc provided > by the distribution (which is ubuntu-20.04) instead of "gcc-8", > - removing the "linux-gcc-default" job. But isn't that what "merging" is about? One merges the diff of side A into B and then removes A. I don't have an idea for a better subject, honestly. > > Signed-off-by: Patrick Steinhardt <ps@pks.im> > > --- > > .github/workflows/main.yml | 4 ---- > > .gitlab-ci.yml | 4 ---- > > ci/lib.sh | 5 ----- > > 3 files changed, 13 deletions(-) > > > > diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml > > index 808ddc19b8a799abc414c6d6ba078a6e5be6bdfb..32d35d2257812f02121b20c3cae342d626481553 100644 > > --- a/.github/workflows/main.yml > > +++ b/.github/workflows/main.yml > > @@ -271,7 +271,6 @@ jobs: > > pool: ubuntu-latest > > - jobname: linux-gcc > > cc: gcc > > - cc_package: gcc-8 > > pool: ubuntu-20.04 > > So linux-gcc uses ubuntu-20.04... > > > - jobname: linux-TEST-vars > > cc: gcc > > @@ -286,9 +285,6 @@ jobs: > > - jobname: osx-gcc > > cc: gcc-13 > > pool: macos-13 > > - - jobname: linux-gcc-default > > - cc: gcc > > - pool: ubuntu-latest > > ...while linux-gcc-default uses ubuntu-latest. > > This is not a big issue but I didn't see that mentioned in the > differences between the two jobs listed in the commit message. Fair, added now. Patrick
On Tue, Jan 7, 2025 at 1:48 PM Patrick Steinhardt <ps@pks.im> wrote: > > On Mon, Jan 06, 2025 at 02:25:23PM +0100, Christian Couder wrote: > > On Mon, Jan 6, 2025 at 8:51 AM Patrick Steinhardt <ps@pks.im> wrote: > > > > > > The "linux-gcc-default" job is mostly doing the same as the "linux-gcc" > > > job, except for a couple of minor differences: > > > > > > - We use an explicit GCC version instead of the default version > > > provided by the distribution. We have other jobs that test with > > > "gcc-8", making this distinction pointless. > > > > > > - We don't set up the Python version explicitly, and instead use the > > > default Python version. Python 2 has been end-of-life for quite a > > > while now though, making this distinction less interesting. > > > > > > - We set up the default branch name to be "main" in "linux-gcc". We > > > have other testcases that don't and also some that explicitly use > > > "master". > > > > > > So overall, the job does not add much to our test coverage. Merge it > > > into our "linux-gcc" job to reduce our test matrix a bit. > > > > I understand that the subject uses "merge" as the space is limited > > there, but it might be better to be a bit more explicit here about > > what the patch is doing, which is: > > > > - making the "linux-gcc" job use the default version of gcc provided > > by the distribution (which is ubuntu-20.04) instead of "gcc-8", > > - removing the "linux-gcc-default" job. > > But isn't that what "merging" is about? One merges the diff of side A > into B and then removes A. I don't have an idea for a better subject, > honestly. My comment was saying that it was fine to use "merge" in the subject, but that, in the body part of the commit message, it would be better if there were more details about what the commit is actually doing. When the commit message is not clear about what the commit does, it's difficult to check that the changes in the commit were intended.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 808ddc19b8a799abc414c6d6ba078a6e5be6bdfb..32d35d2257812f02121b20c3cae342d626481553 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -271,7 +271,6 @@ jobs: pool: ubuntu-latest - jobname: linux-gcc cc: gcc - cc_package: gcc-8 pool: ubuntu-20.04 - jobname: linux-TEST-vars cc: gcc @@ -286,9 +285,6 @@ jobs: - jobname: osx-gcc cc: gcc-13 pool: macos-13 - - jobname: linux-gcc-default - cc: gcc - pool: ubuntu-latest - jobname: linux-leaks cc: gcc pool: ubuntu-latest diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a1bc92893f27d6dd404133686b71c8061e55618c..b86bb0bdb3363e06e6fe4195c34babd67cf7e8cc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,14 +46,10 @@ test:linux: - jobname: linux-gcc image: ubuntu:20.04 CC: gcc - CC_PACKAGE: gcc-8 - jobname: linux-TEST-vars image: ubuntu:20.04 CC: gcc CC_PACKAGE: gcc-8 - - jobname: linux-gcc-default - image: ubuntu:latest - CC: gcc - jobname: linux-leaks image: ubuntu:latest CC: gcc diff --git a/ci/lib.sh b/ci/lib.sh index 930f98d7228166c37c236beb062b14675fb68ef3..e67c481d4fe08d0ebc3253a7a832a96f65c79ffe 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -328,11 +328,6 @@ export SKIP_DASHED_BUILT_INS=YesPlease case "$distro" in ubuntu-*) - if test "$jobname" = "linux-gcc-default" - then - break - fi - # Python 2 is end of life, and Ubuntu 23.04 and newer don't actually # have it anymore. We thus only test with Python 2 on older LTS # releases.
The "linux-gcc-default" job is mostly doing the same as the "linux-gcc" job, except for a couple of minor differences: - We use an explicit GCC version instead of the default version provided by the distribution. We have other jobs that test with "gcc-8", making this distinction pointless. - We don't set up the Python version explicitly, and instead use the default Python version. Python 2 has been end-of-life for quite a while now though, making this distinction less interesting. - We set up the default branch name to be "main" in "linux-gcc". We have other testcases that don't and also some that explicitly use "master". So overall, the job does not add much to our test coverage. Merge it into our "linux-gcc" job to reduce our test matrix a bit. Signed-off-by: Patrick Steinhardt <ps@pks.im> --- .github/workflows/main.yml | 4 ---- .gitlab-ci.yml | 4 ---- ci/lib.sh | 5 ----- 3 files changed, 13 deletions(-)