⚠️ CONFLICT! Lineage pull request for: skeleton #51

cisagovbot · 2024-11-22T22:34:39Z

Lineage Pull Request: CONFLICT

Lineage has created this pull request to incorporate new changes found in an
upstream repository:

Upstream repository: https://github.com/cisagov/skeleton-ansible-role.git
Remote branch: HEAD

Check the changes in this pull request to ensure they won't cause issues with
your project.

The lineage/skeleton branch has one or more unresolved merge conflicts
that you must resolve before merging this pull request!

How to resolve the conflicts

Take ownership of this pull request by removing any other assignees.

Clone the repository locally, and reapply the merge:

git clone [email protected]:cisagov/ansible-role-banner.git ansible-role-banner
cd ansible-role-banner
git remote add skeleton https://github.com/cisagov/skeleton-ansible-role.git
git remote set-url --push skeleton no_push
git switch develop
git switch --create lineage/skeleton --track origin/develop
git pull skeleton HEAD
git status

Review the changes displayed by the status command. Fix any conflicts and
possibly incorrect auto-merges.
After resolving each of the conflicts, add your changes to the
branch, commit, and push your changes:
```
git add .github/dependabot.yml 
git commit
git push --force --set-upstream origin lineage/skeleton
```
Note that you may append to the default merge commit message
that git creates for you, but please do not delete the existing
content. It provides useful information about the merge that is
being performed.
Wait for all the automated tests to pass.
Confirm each item in the "Pre-approval checklist" below.
Remove any of the checklist items that do not apply.
Ensure every remaining checkbox has been checked.
Mark this draft pull request "Ready for review".

✅ Pre-approval checklist

✌️ The conflicts in this pull request have been resolved.
All future TODOs are captured in issues, which are referenced in code comments.
All relevant type-of-change labels have been added.
All new and existing tests pass.

✅ Pre-merge checklist

Mark Fedora 41 checks as required.

Note

You are seeing this because one of this repository's maintainers has
configured Lineage to open pull requests.

For more information:

🛠 Lineage configurations for this project are stored in .github/lineage.yml

📚 Read more about Lineage

This commit will make a few changes. The orginal version of the semantic checking function was a bit more difficult to read. It is now somewhat easier to follow how the regex is structured. Also the function has been renamed to check_python_version since it has 2 functions, making sure that the version is semantically correct and the second is to make sure that it is installed on the user's machine. This makes it easier to follow the logic for the flags, -p or --python-version and -l or --list-versions

…ttps://github.com/cisagov/skeleton-generic into improvement/correct-semantic-python-version-checks

Co-authored-by: dav3r <[email protected]>

Add the `check-useless-excludes` meta hook to verify that any defined `exclude` directives apply to at least one file in the repository.

Since we have a version pin of some kind for the molecule package in the `requirements-test.txt` file it makes sense to ensure this dependency is centrally managed.

Now that we always run systemd-enabled Docker images for our Molecule testing it makes sense to always do this.

Instead of manually installing Packer we can instead leverage the hashicorp/setup-packer Action just as we do for Terraform.

He is no longer a member of @cisagov/vm-dev.

Previously we only provided a lower bound for the version, but pinning to a specific version aligns with what has been done with the prettier hook and how pre-commit hooks are pinned in general. The flake8-docstrings package is rarely updated, so there is no real downside to pinning to a specific version. Co-authored-by: Nick <[email protected]>

Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](actions/cache@v3...v4) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [crazy-max/ghaction-github-status](https://github.com/crazy-max/ghaction-github-status) from 3 to 4. - [Release notes](https://github.com/crazy-max/ghaction-github-status/releases) - [Commits](crazy-max/ghaction-github-status@v3...v4) --- updated-dependencies: - dependency-name: crazy-max/ghaction-github-status dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

This is done automatically with the `pre-commit autoupdate` command. The pre-commit/mirrors-prettier hook was manually held back because the latest tags are for alpha releases of the next major version.

Use the latest v3 release available from NPM.

…max/ghaction-github-status-4 Bump crazy-max/ghaction-github-status from 3 to 4

…s/cache-4 Bump actions/cache from 3 to 4

Use an Action to install Packer in our GitHub Actions workflows

…hon-version-checks Add checks for correct semantic version of Python

@jasonodoom

Remove @jasonodoom as a codeowner

The pip-audit tool will audit any supplied pip requirements files for vulnerable packages.

This adds even more evidence for why it is a good idea to go ahead and upgrade ansible and ansible-core, in addition to the vulnerability that pip-audit turned up. Co-authored-by: Nick M <[email protected]>

…n-for-ansible-core Bump up the lower bound on `ansible-core`

…-pre-commit-hook-version Update the version of the `ansible-lint` `pre-commit` hook

…ndabot Add a dependabot ignore directive for `molecule`

…tialization-for-fedora Add logic to wait for `systemd` initialization to complete on Fedora

We do this because pytest-testinfra 10.1.1 contains a fix for SystemdService.exists that is required by some roles' Molecule test code. Note that we also add a corresponding line to the Dependabot configuration so that descendant repos know this dependency is managed here. Co-authored-by: Nick <[email protected]>

Add a lower-bound pin for `pytest-testinfra`

…pin-for-ansible-core Bump up the lower bound on `ansible-core`

Lineage pull request for: skeleton

…ra-41 Add support for Fedora 41

…eage/skeleton

These files may intentionally have one or more blank lines at the end, so we do not want the end-of-file-fixer pre-commit linter to change them.

Michael Saki and others added 30 commits February 14, 2024 12:59

Add checks for semantic python versions

33582a1

Add checks for semantic python versions

cea8edc

Merge branch 'improvement/correct-semantic-python-version-checks' of h…

f7b9d05

…ttps://github.com/cisagov/skeleton-generic into improvement/correct-semantic-python-version-checks

Remove example of correct semantic version

327ab73

Refactor the error message for the user

4dedf50

Improve the semantic error message

e84deea

Fix grammar

5fdc7be

Co-authored-by: dav3r <[email protected]>

Refactor regex, add link, and improve comments

42ef8c2

Update link to use semver.org over regex101.com

a77e5e1

Remove unnecessary period

5fe14c7

Co-authored-by: dav3r <[email protected]>

Add a meta hook to the pre-commit configuration

b7896a0

Add the `check-useless-excludes` meta hook to verify that any defined `exclude` directives apply to at least one file in the repository.

Remove exclude directive that does not apply to any files

260566f

Add a dependabot ignore directive

8459623

Since we have a version pin of some kind for the molecule package in the `requirements-test.txt` file it makes sense to ensure this dependency is centrally managed.

Add logic to wait for systemd initialization to complete on Fedora

6adafec

Now that we always run systemd-enabled Docker images for our Molecule testing it makes sense to always do this.

Add a lower-bound pin for flake8-docstrings

a68994d

Use the hashicorp/setup-packer GitHub Action

43b91c7

Instead of manually installing Packer we can instead leverage the hashicorp/setup-packer Action just as we do for Terraform.

Remove @jasonodoom as a codeowner

8ada75d

He is no longer a member of @cisagov/vm-dev.

Update pre-commit hook versions

6a58c2c

This is done automatically with the `pre-commit autoupdate` command. The pre-commit/mirrors-prettier hook was manually held back because the latest tags are for alpha releases of the next major version.

Manually update the prettier hook

553efcb

Use the latest v3 release available from NPM.

Merge pull request #170 from cisagov/dependabot/github_actions/crazy-…

184e749

…max/ghaction-github-status-4 Bump crazy-max/ghaction-github-status from 3 to 4

Merge pull request #171 from cisagov/dependabot/github_actions/action…

d99c117

…s/cache-4 Bump actions/cache from 3 to 4

Merge pull request #187 from cisagov/improvement/use_setup_packer_action

2491ca0

Use an Action to install Packer in our GitHub Actions workflows

Merge pull request #176 from cisagov/improvement/correct-semantic-pyt…

f6c9537

…hon-version-checks Add checks for correct semantic version of Python

Merge pull request #188 from cisagov/remove-odoom-as-a-codeowner

10e5f6f

Remove @jasonodoom as a codeowner

Add a pre-commit hook to run pip-audit

045a998

The pip-audit tool will audit any supplied pip requirements files for vulnerable packages.

jsf9k and others added 14 commits November 20, 2024 12:21

Add comments about looming EOL issues for ansible and ansible-core

bd85261

This adds even more evidence for why it is a good idea to go ahead and upgrade ansible and ansible-core, in addition to the vulnerability that pip-audit turned up. Co-authored-by: Nick M <[email protected]>

Add comments about looming EOL issues for ansible and ansible-core

38081fd

This adds even more evidence for why it is a good idea to go ahead and upgrade ansible and ansible-core, in addition to the vulnerability that pip-audit turned up. Co-authored-by: Nick M <[email protected]>

Merge pull request #196 from cisagov/improvement/add-a-lower-bound-pi…

f7ccd9a

…n-for-ansible-core Bump up the lower bound on `ansible-core`

Merge pull request #197 from cisagov/improvement/upgrade-ansible-lint…

a794735

…-pre-commit-hook-version Update the version of the `ansible-lint` `pre-commit` hook

Merge https://github.com/cisagov/skeleton-generic into lineage/skeleton

c10c960

Merge pull request #197 from cisagov/improvement/add_molecule_to_depe…

3e4a67a

…ndabot Add a dependabot ignore directive for `molecule`

Merge pull request #200 from cisagov/improvement/wait-for-systemd-ini…

eb52222

…tialization-for-fedora Add logic to wait for `systemd` initialization to complete on Fedora

Merge pull request #201 from cisagov/improvement/add-prophylactic-pin

b7f9de9

Add a lower-bound pin for `pytest-testinfra`

Merge pull request #209 from cisagov/improvement/bump-up-lower-bound-…

b48fe5c

…pin-for-ansible-core Bump up the lower bound on `ansible-core`

Merge branch 'develop' into lineage/skeleton

8fd8852

Merge remote-tracking branch 'origin/develop' into lineage/skeleton

15f617d

Merge pull request #206 from cisagov/lineage/skeleton

30ebbce

Lineage pull request for: skeleton

Merge pull request #207 from cisagov/improvement/add-support-for-fedo…

e940403

…ra-41 Add support for Fedora 41

cisagovbot assigned dav3r, felddy, jsf9k and mcdonnnj Nov 22, 2024

cisagovbot added the upstream update This issue or pull request pulls in upstream updates label Nov 22, 2024

jsf9k unassigned felddy, dav3r and mcdonnnj Nov 25, 2024

jsf9k added 3 commits November 25, 2024 12:23

Merge remote-tracking branch 'skeleton-ansible-role/develop' into lin…

98b13e5

…eage/skeleton

Uncomment new Dependabot ignore directives from upstream

de4f11e

Exclude files/issue and files/motd from end-of-file-fixer

45d7cbc

These files may intentionally have one or more blank lines at the end, so we do not want the end-of-file-fixer pre-commit linter to change them.

jsf9k force-pushed the lineage/skeleton branch from 7d677e5 to 45d7cbc Compare November 25, 2024 17:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

⚠️ CONFLICT! Lineage pull request for: skeleton #51

⚠️ CONFLICT! Lineage pull request for: skeleton #51

cisagovbot commented Nov 22, 2024 •

edited by jsf9k

Loading

⚠️ CONFLICT! Lineage pull request for: skeleton #51

Are you sure you want to change the base?

⚠️ CONFLICT! Lineage pull request for: skeleton #51

Conversation

cisagovbot commented Nov 22, 2024 • edited by jsf9k Loading

Lineage Pull Request: CONFLICT

How to resolve the conflicts

✅ Pre-approval checklist

✅ Pre-merge checklist

cisagovbot commented Nov 22, 2024 •

edited by jsf9k

Loading