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

cronjobs: new filename scheme and G84 added #896

Merged
merged 4 commits into from
May 29, 2023
Merged

cronjobs: new filename scheme and G84 added #896

merged 4 commits into from
May 29, 2023

Conversation

neteler
Copy link
Member

@neteler neteler commented May 18, 2023

Following the creation of the new GRASS GIS 8.3 release branch an overhaul of the cronjob scripts is needed.

label meaning
legacy legacy stable version, no longer recommended for use
old current current stable version, widely used
new current upcoming stable version, for early adopters
preview development version, for developers and new feature enthusiasts

The labels follow the download sections on https://grass.osgeo.org/download/ (see operating system subpages).

Following this filename scheme, the cronjob files have been renamed and new files been added:

  • renamed: cron_grass7_relbranch_build_binaries.sh -> cron_grass_legacy_build_binaries.sh
  • renamed: cron_grass7_relbranch_src_snapshot.sh -> cron_grass_legacy_src_snapshot.sh
  • renamed: cron_grass8_main_build_binaries.sh -> cron_grass_new_current_build_binaries.sh
  • renamed: cron_grass8_main_src_snapshot.sh -> cron_grass_new_current_src_snapshot.sh
  • renamed: cron_grass8_relbranch_build_binaries.sh -> cron_grass_old_current_build_binaries.sh
  • renamed: cron_grass8_relbranch_src_snapshot.sh -> cron_grass_old_current_src_snapshot.sh
  • new file: cron_grass_preview_build_binaries.sh
  • new file: cron_grass_preview_src_snapshot.sh

Importantly, no version numbers are part of the file names to gain long term stability.

In case of version increments, "just" the versions coded in the file(s) need to be updated and (in some cases) new directories been created on grass.osgeo.org - see respective comments in the cron_grass*.sh files.

Note: the redundancy in the files may be addressed by refactoring in a separate PR.

Following the creation of the new GRASS GIS 8.3 release branch an overhaul of the cronjob scripts is needed.

| **label**   | **version number** |
| ----------- | ------------------ |
| legacy      | 7.8                |
| old current | 8.2                |
| new current | 8.3                |
| preview     | 8.4                |

Following this file name scheme, the cronjob files have been renamed and new files been added:

* renamed: cron_grass7_relbranch_build_binaries.sh -> cron_grass7_legacy_build_binaries.sh
* renamed: cron_grass7_relbranch_src_snapshot.sh -> cron_grass7_legacy_src_snapshot.sh
* renamed: cron_grass8_main_build_binaries.sh -> cron_grass8_new_current_build_binaries.sh
* renamed: cron_grass8_main_src_snapshot.sh -> cron_grass8_new_current_src_snapshot.sh
* renamed: cron_grass8_relbranch_build_binaries.sh -> cron_grass8_old_current_build_binaries.sh
* renamed: cron_grass8_relbranch_src_snapshot.sh -> cron_grass8_old_current_src_snapshot.sh
* new file: cron_grass8_preview_build_binaries.sh
* new file: cron_grass8_preview_src_snapshot.sh

Importantly, no version numbers are part of the file names to gain long term stability.

In case of version increments, "just" the versions coded in the file(s) need to be updated and (in some cases) new directories been created on grass.osgeo.org (see respective comments in the `cron_grass*.sh` files).
@neteler neteler requested review from wenzeslaus and tmszi May 18, 2023 18:04
Copy link
Member

@wenzeslaus wenzeslaus left a comment

Choose a reason for hiding this comment

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

  1. The new names still contain version although "no version numbers are part of the file names" is stated as one of the goals.
  2. Same issue, different take on it: The names grass7 and grass8 go against the Usage section of Version Numbering RFC: "Version should be considered a separate item from the name." Or in other words, 7 and 8 are not part the name, but really version numbers.

@ninsbl
Copy link
Member

ninsbl commented May 18, 2023

See also #814 for a more comprehensive change with regards to removing version numbers. May be you can take over / finish of that PR?

Comment on lines 32 to 33
* grass8-old-current (current stable): `cron_grass8_old_current_src_snapshot.sh`
* grass8-new-current (new stable): `cron_grass8_new_current_src_snapshot.sh`
Copy link
Member

Choose a reason for hiding this comment

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

If you want to explain somewhere what the strange "old current" means, use the overview table for that instead of trying to fix a cryptic name for each entry in this list.

Copy link
Member Author

@neteler neteler May 23, 2023

Choose a reason for hiding this comment

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

Polished in 15f4a5d: See updated README.md

Copy link
Member

Choose a reason for hiding this comment

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

All the pieces except the file name are not necessary, but we can address that later in something like #814.

What I mean is that it is basically just repeating the file name (the thing with dashes) and then the table (the thing in parentheses), so it brings more characters, not more information.

Comment on lines 31 to 34
* grass7-stable (legacy): `cron_grass7_legacy_src_snapshot.sh`
* grass8-old-current (current stable): `cron_grass8_old_current_src_snapshot.sh`
* grass8-new-current (new stable): `cron_grass8_new_current_src_snapshot.sh`
* grass8-preview (development): `cron_grass8_preview_src_snapshot.sh`
Copy link
Member

Choose a reason for hiding this comment

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

I have no idea where these labels such as grass8-new-current appear.

Copy link
Member Author

Choose a reason for hiding this comment

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

Polished in 15f4a5d

Copy link
Member

Choose a reason for hiding this comment

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

Where does the thing with dashes appear except for this list?

Copy link
Member Author

Choose a reason for hiding this comment

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

It doesn't. It is an "summary" item explanation to not just list the name of the file there.

Better suggestions (please edit directly) are welcome.

Copy link
Member

Choose a reason for hiding this comment

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

If I would edit that I would just delete the whole part because the clarity needs to be in the file names not in a possibly outdated list plus-I-don't-get-the-dashes-there, so I pass.

Copy link
Member Author

Choose a reason for hiding this comment

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

Ok, removed in 1a3d988

utils/cronjobs_osgeo_lxd/README.md Outdated Show resolved Hide resolved
@neteler
Copy link
Member Author

neteler commented May 18, 2023

See also #814 for a more comprehensive change with regards to removing version numbers. May be you can take over / finish of that PR?

Oh, I wasn't any more aware of that. Not sure if I find the time in the next days to redo everything.

@neteler
Copy link
Member Author

neteler commented May 18, 2023

So I kick this PR.

@neteler neteler closed this May 18, 2023
@wenzeslaus
Copy link
Member

This one is actually closer to what we need to release 8.3.0-RC1, but it depends when we want to release it.

@neteler
Copy link
Member Author

neteler commented May 20, 2023

This PR might be the interim one.

@neteler neteler reopened this May 23, 2023
@neteler neteler requested a review from wenzeslaus May 23, 2023 16:24
@neteler
Copy link
Member Author

neteler commented May 23, 2023

  1. The new names still contain version although "no version numbers are part of the file names" is stated as one of the goals.

Fixed.

2. Same issue, different take on it: The names _grass7_ and _grass8_ go against the _Usage_ section of [Version Numbering RFC](https://github.com/OSGeo/grass/blob/main/doc/development/rfc/version_numbering.md): "Version should be considered a separate item from the name." Or in other words, 7 and 8 are not part the name, but really version numbers.

Yes, changed.

@wenzeslaus
Copy link
Member

wenzeslaus commented May 23, 2023

It's not clear to me if the line GPATCH=1 # required by grass-addons-index.sh needs an update or not.

@wenzeslaus
Copy link
Member

It's not clear to me if the line GPATCH=1 # required by grass-addons-index.sh needs an update or not.

Oh, it's clear to me now. It's for 8.2.1. The others have 0dev as micro as they should.

@neteler
Copy link
Member Author

neteler commented May 25, 2023

@wenzeslaus Anything serious yet missing? I'd like to move on with this topic (and the PR is blocked).

@neteler neteler dismissed wenzeslaus’s stale review May 29, 2023 09:58

Relevant issues have been addressed

@neteler neteler merged commit f32aeb2 into OSGeo:grass8 May 29, 2023
@neteler neteler deleted the cronjob_update_new_versions_and_renaming branch May 29, 2023 09:59
neteler added a commit to neteler/grass-addons that referenced this pull request May 29, 2023
After merging of OSGeo#896 and cronjob deployment on grass.osgeo.org various issues came up which are addressed in this PR.

Important:
- fix incorrect branch in `cron_grass_new_current_build_binaries.sh`
- generate programmer's manual only in `cron_grass_new_current_build_binaries.sh`

Improvements:
- fail early rather than useless continuation (`set -e`)
- compile with 2 cores (`make -j2`)
- fix copying of `INSTALL` and `REQUIREMENTS.html` to server download directory as being renamed to `INSTALL.md` and `REQUIREMENTS.md`
- also copy `CITATION.cff` to server download directory

Misc:
- no longer generate gettext `.pot` file for transifex since we migrated to https://weblate.osgeo.org/projects/grass-gis/

This PR potentially also addresses OSGeo#814 (can @ninsbl please verify what's yet missing)?
neteler added a commit that referenced this pull request May 31, 2023
After merging of #896 and cronjob deployment on grass.osgeo.org various issues came up which are addressed in this PR.

Important:
- fix incorrect branch in `cron_grass_new_current_build_binaries.sh`
- generate programmer's manual only in `cron_grass_new_current_build_binaries.sh`

Improvements:
- fail early rather than useless continuation (`set -e`)
- compile with 2 cores (`make -j2`)
- fix copying of `INSTALL` and `REQUIREMENTS.html` to server download directory as being renamed to `INSTALL.md` and `REQUIREMENTS.md`
- also copy `CITATION.cff` to server download directory

Misc:
- no longer generate gettext `.pot` file for transifex since we migrated to https://weblate.osgeo.org/projects/grass-gis/

(this PR potentially also addresses #814)
cwhite911 pushed a commit to cwhite911/grass-addons that referenced this pull request Sep 19, 2023
Following the creation of the new GRASS GIS 8.3 release branch an overhaul of the cronjob scripts is needed.

| **label**   | **meaning**                                                     |
| ----------- | --------------------------------------------------------------- |
| legacy      | legacy stable version, no longer recommended for use            |
| old current | current stable version, widely used                             |
| new current | upcoming stable version, for early adopters                     |
| preview     | development version, for developers and new feature enthusiasts |

The labels follow the download sections on https://grass.osgeo.org/download/ (see operating system subpages).

Following this filename scheme, the cronjob files have been renamed and new files been added:

* renamed: `cron_grass7_relbranch_build_binaries.sh -> cron_grass_legacy_build_binaries.sh`
* renamed: `cron_grass7_relbranch_src_snapshot.sh -> cron_grass_legacy_src_snapshot.sh`
* renamed: `cron_grass8_main_build_binaries.sh -> cron_grass_new_current_build_binaries.sh`
* renamed: `cron_grass8_main_src_snapshot.sh -> cron_grass_new_current_src_snapshot.sh`
* renamed: `cron_grass8_relbranch_build_binaries.sh -> cron_grass_old_current_build_binaries.sh`
* renamed: `cron_grass8_relbranch_src_snapshot.sh -> cron_grass_old_current_src_snapshot.sh`
* new file: `cron_grass_preview_build_binaries.sh`
* new file: `cron_grass_preview_src_snapshot.sh`

Importantly, no version numbers are part of the file names to gain long term stability.

In case of version increments, "just" the versions coded in the file(s) need to be updated and (in some cases) new directories been created on grass.osgeo.org - see respective comments in the `cron_grass*.sh` files.

Note: the redundancy in the files may be addressed by refactoring in a separate PR.
cwhite911 pushed a commit to cwhite911/grass-addons that referenced this pull request Sep 19, 2023
After merging of OSGeo#896 and cronjob deployment on grass.osgeo.org various issues came up which are addressed in this PR.

Important:
- fix incorrect branch in `cron_grass_new_current_build_binaries.sh`
- generate programmer's manual only in `cron_grass_new_current_build_binaries.sh`

Improvements:
- fail early rather than useless continuation (`set -e`)
- compile with 2 cores (`make -j2`)
- fix copying of `INSTALL` and `REQUIREMENTS.html` to server download directory as being renamed to `INSTALL.md` and `REQUIREMENTS.md`
- also copy `CITATION.cff` to server download directory

Misc:
- no longer generate gettext `.pot` file for transifex since we migrated to https://weblate.osgeo.org/projects/grass-gis/

(this PR potentially also addresses OSGeo#814)
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.

None yet

3 participants