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

Remove unnecessary macros #3632

Merged
merged 2 commits into from
Feb 4, 2025

Conversation

maximiliankolb
Copy link
Contributor

@maximiliankolb maximiliankolb commented Jan 31, 2025

What changes are you introducing?

Remove unnecessary macros to simplify reading the source code of foreman-documentation.

Why are you introducing these changes? (Explanation, links to references, issues, etc.)

As a response to #2773, I looked at these files.

Anything else to add? (Considerations, potential downsides, alternative solutions you have explored, etc.)

Checklists

  • I am okay with my commits getting squashed when you merge this PR.
  • I am familiar with the contributing guidelines.

Please cherry-pick my commits into:

  • Foreman 3.13/Katello 4.15 (EL9 only)
  • Foreman 3.12/Katello 4.14 (Satellite 6.16)
  • Foreman 3.11/Katello 4.13 (orcharhino 6.11 on EL8 only; orcharhino 7.0 on EL8+EL9)
  • Foreman 3.10/Katello 4.12
  • Foreman 3.9/Katello 4.11 (Satellite 6.15; orcharhino 6.8/6.9/6.10)
  • Foreman 3.8/Katello 4.10
  • Foreman 3.7/Katello 4.9 (Satellite 6.14)
  • We do not accept PRs for Foreman older than 3.7.

* This file is not used by Satellite.
* Satellite also does not support Debian-installer which did not use any
  "ifdef" macro before. Now, it's consistent.
@maximiliankolb maximiliankolb marked this pull request as ready for review January 31, 2025 08:32
@github-actions github-actions bot added Needs tech review Requires a review from the technical perspective Needs style review Requires a review from docs style/grammar perspective Needs testing Requires functional testing labels Jan 31, 2025
@maximiliankolb maximiliankolb linked an issue Jan 31, 2025 that may be closed by this pull request
@maximiliankolb maximiliankolb removed Needs tech review Requires a review from the technical perspective Not yet reviewed Needs testing Requires functional testing labels Jan 31, 2025
Copy link

The PR preview for 980d40f is available at theforeman-foreman-documentation-preview-pr-3632.surge.sh

The following output files are affected by this PR:

show diff

show diff as HTML

Copy link
Contributor

@Lennonka Lennonka left a comment

Choose a reason for hiding this comment

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

LGTM, no changes in content as such ✔️

@Lennonka Lennonka added style review done No issues from docs style/grammar perspective and removed Needs style review Requires a review from docs style/grammar perspective labels Feb 3, 2025
@maximiliankolb maximiliankolb merged commit 545c779 into theforeman:master Feb 4, 2025
9 of 10 checks passed
@maximiliankolb maximiliankolb deleted the list_of_upstream_os branch February 4, 2025 12:55
maximiliankolb added a commit that referenced this pull request Feb 4, 2025
* Simplify macros in assembly
* Drop unnecessary ifdef macro
  This file is not used by Satellite.
  Satellite also does not support Debian-installer which did not use any
  "ifdef" macro before. Now, it's consistent.

(cherry picked from commit 545c779)
maximiliankolb added a commit that referenced this pull request Feb 4, 2025
* Simplify macros in assembly
* Drop unnecessary ifdef macro
  This file is not used by Satellite.
  Satellite also does not support Debian-installer which did not use any
  "ifdef" macro before. Now, it's consistent.

(cherry picked from commit 545c779)
@maximiliankolb
Copy link
Contributor Author

maximiliankolb commented Feb 4, 2025

Merged to "master" and cherry-picked:
8e644e8..e663495 3.13 -> 3.13
4fb6f39..936e468 3.12 -> 3.12

Tested locally: Built all flavours of foreman-documentation starting 2025-02-04 13:57:56+01:00: SUCCESS. -> will check/restart GHA for 3.12 if necessary.

All good now: https://github.com/theforeman/foreman-documentation/actions/runs/13136011701

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
style review done No issues from docs style/grammar perspective
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Extend lists of supported OSs for upstream too
2 participants