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

cops, bicbucstriim: update to depend on DSM 7.2 #6340

Merged
merged 5 commits into from
Nov 30, 2024

Conversation

hgy59
Copy link
Contributor

@hgy59 hgy59 commented Nov 30, 2024

Description

noarch packages depending on PHP 8.2 require DSM 7.2 and packages must include this dependency.
So far we have those packages:

  • cops
  • bicbucstriim

bugfixes:

  • handle REQUIRED_MIN_DSM = 7.2 for noarch packages
  • add option to include noarch-7.2 packages in build workflow

Fixes #6339

Checklist

  • Build rule all-supported completed successfully
  • New installation of package completed successfully
  • Package upgrade completed successfully (Manually install the package again)
  • Package functionality was tested
  • Any needed documentation is updated/created

Type of change

  • Bug fix
  • Includes small framework changes

- handle REQUIRED_MIN_DSM = 7.2 for noarch packages
- add option to include noarch-7.2 packages in build workflow
@mreid-tt
Copy link
Contributor

@hgy59, guess this can be modified to also treat with BicBucStriim?

@mreid-tt
Copy link
Contributor

@hgy59 the build failure is because the source file was changed. It now has the suffix of '-php82' in the filename so the whole file is now called: cops-3.2.2-php82.zip. Adjusting this in the cross/ should fix it.

- source file was renamed
@hgy59
Copy link
Contributor Author

hgy59 commented Nov 30, 2024

@hgy59 the build failure is because the source file was changed. It now has the suffix of '-php82' in the filename so the whole file is now called: cops-3.2.2-php82.zip. Adjusting this in the cross/ should fix it.

already found this for bicbucstriim but for cops I had the old one in the distrib folder...

@hgy59
Copy link
Contributor Author

hgy59 commented Nov 30, 2024

@hgy59, guess this can be modified to also treat with BicBucStriim?

already done locally, but want to validate the new build matrix first.

- use different name for noarch-7.2 to allow parallel 7.0 and 7.2 packages
- fix source url
- use REQUIRED_MIN_DSM = 7.2 for PHP8.2
- remove SERVICE_USER (required for DSM 6 only)
@hgy59 hgy59 changed the title cops: update to depend on DSM 7.2 cops, bicbucstriim: update to depend on DSM 7.2 Nov 30, 2024
@hgy59 hgy59 requested a review from mreid-tt November 30, 2024 12:50
@hgy59 hgy59 merged commit e145e72 into SynoCommunity:master Nov 30, 2024
11 checks passed
@hgy59 hgy59 deleted the add_noarch_dsm72 branch November 30, 2024 13:14
@hgy59 hgy59 added the status/published Published and activated (may take up to 48h until visible in DSM package manager) label Nov 30, 2024
@hgy59
Copy link
Contributor Author

hgy59 commented Nov 30, 2024

Both packages published for DSM 7.2.

Existing packages with PHP 8.2 and DSM 7.0 deactivated new (to allow manual installation, for the rare case a user wants to install cops or bicbucstriim on DSM 7.2 before those are visible in Package Center).

@hgy59
Copy link
Contributor Author

hgy59 commented Nov 30, 2024

@mreid-tt there is a small issue in regular builds, when changed packages require DSM 7.2.
In such a case the arch specific dsm72 build are added to the matrix, even when only noarch packages have changed.
And probably dsm72 noarch packages are added, when only arch specific packages have changed.

For manually triggered builds this is handled by separated options.
For the regular builds there is only one flag yet. The respective evaluation in prepare.sh must be enhanced.

@mreid-tt
Copy link
Contributor

mreid-tt commented Nov 30, 2024

@hgy59 a possible solution would be to add checks for the presence of packages by adding these lines:

          arch_packages=${{ needs.prepare.outputs.arch_packages }}
          noarch_packages=${{ needs.prepare.outputs.noarch_packages }}

right after this line:

add_srm12_builds=${{ needs.prepare.outputs.add_srm12_builds }}

Then, you could modify this line:

if [ "$add_dsm72_builds" == "true" ]; then

to say something like this:

          if [ "$add_dsm72_builds" == "true" ] && [ -n "$arch_packages" ]; then

mreid-tt added a commit that referenced this pull request Dec 6, 2024
* Amend build matrix for noarch-7.2
- Fixes incorrect inclusion of DSM 7.2 builds when only noarch packages are required (#6340)
- Consolidated matrix logic into set-defaults as a single source of truth
- Simplified and clarified manual build inputs for a better user experience
- Removed redundant needs dependencies in downstream jobs

* Update BicBucStriim to v3.6.3
* Update cops to v3.4.5
urosch pushed a commit to urosch/spksrc that referenced this pull request Dec 9, 2024
* cops: update to depend on DSM 7.2 (SynoCommunity#6339)
- handle REQUIRED_MIN_DSM = 7.2 for noarch packages
- source file was renamed

* update build matrix for noarch-7.2
- add option to include noarch-7.2 packages in build workflow
- use different name for noarch-7.2 to allow parallel 7.0 and 7.2 packages

* bicbucstriim: update to depend on DSM 7.2
- fix source url
- use REQUIRED_MIN_DSM = 7.2 for PHP8.2
- remove SERVICE_USER (required for DSM 6 only)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
framework status/published Published and activated (may take up to 48h until visible in DSM package manager)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

COPS package must be restricted to DSM 7.2
2 participants