Skip to content

Commit

Permalink
Merge pull request #6167 from jkonecny12/main-master-to-main-fixes
Browse files Browse the repository at this point in the history
Fix more master -> main renaming
  • Loading branch information
jkonecny12 authored Feb 14, 2025
2 parents be58730 + 2af1395 commit 8228846
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ check-branching:
@echo "===================================="
@echo "Testing pykickstart configuration"
@echo "===================================="
@substituted_branch=$$(echo "$(GIT_BRANCH)" | sed 's/^master$$/DEVEL/'); \
@substituted_branch=$$(echo "$(GIT_BRANCH)" | sed 's/^main$$/DEVEL/'); \
for i in $$(git grep 'from pykickstart.version import DEVEL as VERSION' -- pyanaconda/ dracut/ | awk -F "[: ]" '!/.j2:/ {print $$1 ";" $$5}'); do \
i=$${i^^}; \
if [ "$${i#*;}" != "$$substituted_branch" ]; then \
Expand Down
2 changes: 1 addition & 1 deletion dracut/README-driver-updates.md
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ handled by `parse-kickstart`:

Check the [kickstart documentation] for more info.

[kickstart documentation]: https://github.com/pykickstart/pykickstart/blob/master/docs/kickstart-docs.rst#driverdisk
[kickstart documentation]: https://github.com/pykickstart/pykickstart/blob/main/docs/kickstart-docs.rst#driverdisk

## initqueue: `[email protected]`

Expand Down
2 changes: 1 addition & 1 deletion tests/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ The launcher scripts are listed under `TESTS` in `tests/Makefile.am`.
.. _pytest -k: https://docs.pytest.org/en/7.1.x/reference/reference.html#command-line-flags
.. _GitHub workflows: https://docs.github.com/en/free-pro-team@latest/actions
.. _kickstart-tests.yml workflow: ../.github/workflows/kickstart-tests.yml
.. _kickstart launch script: https://github.com/rhinstaller/kickstart-tests/blob/master/containers/runner/README.md
.. _kickstart launch script: https://github.com/rhinstaller/kickstart-tests/blob/main/containers/runner/README.md
.. _container-autoupdate.yml workflow: ../.github/workflows/container-autoupdate.yml
.. _actions tab: https://github.com/rhinstaller/anaconda/actions?query=workflow%3A%22Refresh+container+images%22
.. _unittests library: https://docs.python.org/3/library/unittest.html
Expand Down

0 comments on commit 8228846

Please sign in to comment.