Skip to content

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

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 88 commits into from
Dec 5, 2024
Merged

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

merged 88 commits into from
Dec 5, 2024

Conversation

@cisagovbot
Copy link

@cisagovbot cisagovbot commented Nov 22, 2024 •
edited by jsf9k
Loading

Lineage Pull Request: CONFLICT

Achtung!!!

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

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

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

    git clone [email protected]:cisagov/skeleton-ansible-role-with-test-user.git skeleton-ansible-role-with-test-user
cd skeleton-ansible-role-with-test-user
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

  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/dependabot.yml .github/workflows/build.yml requirements-test.txt 
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

  • ✌️ 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

Michael Saki and others added 30 commits February 14, 2024 12:59
Add checks for semantic python versions
33582a1
Refactor code for the semantic check
9438194 
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
Add checks for semantic python versions
cea8edc
Refactor code for the semantic check
d5c7c4a 
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
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
@michaelsaki @dav3r
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
@michaelsaki @dav3r
Remove unnecessary period
5fe14c7 
Co-authored-by: dav3r <[email protected]>
@mcdonnnj
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.
@mcdonnnj
Remove exclude directive that does not apply to any files
260566f
@mcdonnnj
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.
@jsf9k
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.
@jsf9k
Add a lower-bound pin for flake8-docstrings
a68994d
@mcdonnnj
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.
@jsf9k
Remove @jasonodoom as a codeowner
8ada75d 
He is no longer a member of @cisagov/vm-dev.
@jsf9k @mcdonnnj
Pin to a specific version
2930208 
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]>
@dependabot
Bump actions/cache from 3 to 4
46e0553 
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]>
@dependabot
Bump crazy-max/ghaction-github-status from 3 to 4
3167421 
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]>
@mcdonnnj
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.
@mcdonnnj
Manually update the prettier hook
553efcb 
Use the latest v3 release available from NPM.
@mcdonnnj
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
@mcdonnnj
Merge pull request #171 from cisagov/dependabot/github_actions/action…
d99c117 
…s/cache-4

Bump actions/cache from 3 to 4
@mcdonnnj
Merge pull request #187 from cisagov/improvement/use_setup_packer_action
2491ca0 
Use an Action to install Packer in our GitHub Actions workflows
@mcdonnnj
Merge pull request #176 from cisagov/improvement/correct-semantic-pyt…
f6c9537 
…hon-version-checks

Add checks for correct semantic version of Python
@mcdonnnj
Merge pull request #188 from cisagov/remove-odoom-as-a-codeowner
10e5f6f 
Remove @jasonodoom as a codeowner
@mcdonnnj
Add a pre-commit hook to run pip-audit
045a998 
The pip-audit tool will audit any supplied pip requirements files for
vulnerable packages.
@cisagovbot cisagovbot added the upstream update This issue or pull request pulls in upstream updates label Nov 22, 2024
@jsf9k jsf9k added improvement This issue or pull request will add or improve functionality, maintainability, or ease of use dependencies Pull requests that update a dependency file github-actions Pull requests that update GitHub Actions code security This issue or pull request addresses a security issue labels Nov 27, 2024
@jsf9k jsf9k marked this pull request as ready for review November 27, 2024 21:59
@jsf9k jsf9k requested a review from a team November 27, 2024 21:59
felddy
felddy approved these changes Dec 4, 2024
View reviewed changes
Copy link
Contributor

@felddy felddy left a comment

Choose a reason for hiding this comment

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

Meh.

mcdonnnj
mcdonnnj approved these changes Dec 4, 2024
View reviewed changes
Copy link
Member

@mcdonnnj mcdonnnj left a comment

Choose a reason for hiding this comment

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

LGTM ✔

@mcdonnnj mcdonnnj added the kraken 🐙 This pull request is ready to merge during the next Lineage Kraken release label Dec 4, 2024
@jsf9k jsf9k merged commit e1f935b into develop Dec 5, 2024
60 checks passed
@jsf9k jsf9k deleted the lineage/skeleton branch December 5, 2024 00:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dav3r dav3r dav3r approved these changes

@mcdonnnj mcdonnnj mcdonnnj approved these changes

@jsf9k jsf9k Awaiting requested review from jsf9k jsf9k is a code owner

+1 more reviewer

@felddy felddy felddy approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@jsf9k jsf9k

Labels

dependencies Pull requests that update a dependency file github-actions Pull requests that update GitHub Actions code improvement This issue or pull request will add or improve functionality, maintainability, or ease of use kraken 🐙 This pull request is ready to merge during the next Lineage Kraken release security This issue or pull request addresses a security issue upstream update This issue or pull request pulls in upstream updates

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@cisagovbot @felddy @dav3r @mcdonnnj @jsf9k @michaelsaki