⚠️ CONFLICT! Lineage pull request for: skeleton

[cisagovbot]

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-packer.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

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

2. Clone the repository locally, and reapply the merge:

   git clone git@github.com:cisagov/samba-packer.git samba-packer
   cd samba-packer
   git remote add skeleton https://github.com/cisagov/skeleton-packer.git
   git remote set-url --push skeleton no_push
   git switch develop
   git checkout -b lineage/skeleton --track origin/develop
   git pull skeleton HEAD
   git status

3. Review the changes displayed by the status command. Fix any conflicts and
   possibly incorrect auto-merges.

4. After resolving each of the conflicts, add your changes to the
   branch, commit, and push your changes:

   git add .github/CODEOWNERS .github/dependabot.yml src/aws.yml src/example.yml src/requirements.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.

5. Wait for all the automated tests to pass.

6. Confirm each item in the "Pre-approval checklist" below.

7. Remove any of the checklist items that do not apply.

8. Ensure every remaining checkbox has been checked.

9. Mark this draft pull request "Ready for review".

✅ Pre-approval checklist

Remove any of the following that do not apply. If you're unsure about
any of these, don't hesitate to ask. We're here to help!

• ✌️ The conflicts in this pull request have been resolved.
• All relevant type-of-change labels have been added.
• All new and existing tests pass.

✅ Pre-merge checklist

Remove any of the following that do not apply. These boxes should
remain unchecked until the pull request has been approved.

• Bump major, minor, patch, or pre-release version as
  appropriate
  via the bump_version.sh script if this repository is
  versioned and the changes in this PR warrant a version
  bump.
• Finalize version.

✅ Post-merge checklist

Remove any of the following that do not apply.

• Create a release.

---

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

[dav3r]

[jsf9k]

I would say that this change requires a version bump, since although the code hasn't functionally changed it has changed. What do you say, @mcdonnnj?

[mcdonnnj]

I would say that this change requires a version bump, since although the code hasn't functionally changed it has changed. What do you say, @mcdonnnj?

@jsf9k I think a patch version bump seems reasonable given the changes here and any changes that may have occurred in its Ansible role dependencies.

[jsf9k]

I would say that this change requires a version bump, since although the code hasn't functionally changed it has changed. What do you say, @mcdonnnj?

@jsf9k I think a patch version bump seems reasonable given the changes here and any changes that may have occurred in its Ansible role dependencies.

@jmorrowomni, can you:

• Bump the patch part of the version?
• Add back into the PR description the "Pre-merge" and "Post-merge" checklists?

You can crib from this PR.

[jsf9k]

Please see the comment here.

[jsf9k]

You need to update samba.yml to use ansible.builtin.include_role instead of a roles block.

[jmorrowomni]

You need to update samba.yml to use ansible.builtin.include_role instead of a roles block.

See 2293a5d