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

cisagovbot · 2022-06-13T15:36:09Z

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-docker.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 git@github.com:cisagov/guacscanner-docker.git guacscanner-docker
cd guacscanner-docker
git remote add skeleton https://github.com/cisagov/skeleton-docker.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

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 README.md docker-compose.yml tests/container_test.py 
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.
Check the "Everything is cool" checkbox below:
- ✌️ The conflicts in this pull request have been resolved.
Mark this draft pull request "Ready for review".

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

Update pre-commit hooks using `pre-commit autoupdate`.

This comment explains that the configuration may have commented out ignore directives that should be uncommented in downstream projects.

yamllint does not like it when you comment out pieces of dictionaries in lists. Upcoming additions to the Dependabot configuration will run afoul of this so we are updating the yamllint configuration.

…_yamllint_configurations Add boilerplate for upcoming Dependabot configuration changes

Update pre-commit hooks

Given the inconsistent behavior of underscores used within words for style we should prefer asterisks now that these rules are available.

…configuration Use new `markdownlint` rules for emphasis- and strong-styles

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2 to 3. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](actions/setup-python@v2...v3) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>

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

Update pre-commit hooks using `pre-commit autoupdate`. The `ansible-lint` hook is intentionally held back due to issues with upgrading to v6.

This adds commented out ignore directives for the following GitHub Actions: - action/cache - action/checkout - action/setup-python These should be uncommented downstream to ensure that updates to these dependencies are pushed from pull requests made in the skeleton.

…s/setup-python-3 Bump actions/setup-python from 2 to 3

…s/checkout-3 Bump actions/checkout from 2 to 3

Bumps [actions/cache](https://github.com/actions/cache) from 2 to 3. - [Release notes](https://github.com/actions/cache/releases) - [Commits](actions/cache@v2...v3) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>

…thub_actions

…es_for_github_actions Add Dependabot ignore directives

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

Use Python 3.10 for the `lint` job in GitHub Actions

Update `pre-commit` hooks

Add hooks to validate GitHub Actions and GitHub Action workflows. These are validated using JSON Schemas.

…re-commit_hooks Add `pre-commit` hooks to validate GitHub Actions content

Uncomment the `github-actions` Dependabot ignore directives because those dependencies are managed by cisagov/skeleton-generic upstream.

…keleton

Version 13.5-0-deb11u1 was being used before, but that version is no longer available.

jsf9k · 2022-09-26T14:37:30Z

Somehow this PR got left behind during the last Kraken. I only realized this morning because the APB build started failing because an upstream Debian package no longer exists.

Please review @dav3r and @mcdonnnj.

dav3r

LGTM! 👍

mcdonnnj

LGTM ✔

⚠️ CONFLICT! Lineage pull request for: skeleton

mcdonnnj and others added 30 commits February 23, 2022 20:11

Update pre-commit hooks

ad71ef3

Update pre-commit hooks using `pre-commit autoupdate`.

Add comment to Dependabot configuration

a05b45a

This comment explains that the configuration may have commented out ignore directives that should be uncommented in downstream projects.

Disable comments-indentation rule for yamllint

77b20ab

yamllint does not like it when you comment out pieces of dictionaries in lists. Upcoming additions to the Dependabot configuration will run afoul of this so we are updating the yamllint configuration.

Merge pull request #99 from cisagov/improvement/update_dependabot_and…

d712690

…_yamllint_configurations Add boilerplate for upcoming Dependabot configuration changes

Merge branch 'develop' into maintenance/update_pre-commit_hooks

3303e46

Merge pull request #98 from cisagov/maintenance/update_pre-commit_hooks

d0817e2

Update pre-commit hooks

Use asterisks for emphasis- and strong-styles

706bded

Given the inconsistent behavior of underscores used within words for style we should prefer asterisks now that these rules are available.

Add missing hyphen in markdownlint rule header

7868a35

Merge pull request #100 from cisagov/improvement/update_markdownlint_…

6978f2a

…configuration Use new `markdownlint` rules for emphasis- and strong-styles

Update pre-commit hooks

9a03808

Update pre-commit hooks using `pre-commit autoupdate`. The `ansible-lint` hook is intentionally held back due to issues with upgrading to v6.

Upgrade from Python 3.9 to 3.10 for the lint job in GHA

5839926

Use consistent quoting for software versions

e22c12c

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

a3f12f4

…s/setup-python-3 Bump actions/setup-python from 2 to 3

Merge branch 'develop' into dependabot/github_actions/actions/checkout-3

6869c68

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

e190ae7

…s/checkout-3 Bump actions/checkout from 2 to 3

Merge branch 'develop' into improvement/add_dependabot_ignores_for_gi…

496ea93

…thub_actions

Merge pull request #107 from cisagov/improvement/add_dependabot_ignor…

a9c93d0

…es_for_github_actions Add Dependabot ignore directives

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

d168151

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

Merge branch 'develop' into improvement/use_python_3.10_for_gha

14aff9c

Merge pull request #106 from cisagov/improvement/use_python_3.10_for_gha

504ed9e

Use Python 3.10 for the `lint` job in GitHub Actions

Merge branch 'develop' into maintenance/update_pre-commit_hooks

57d6ac0

Merge pull request #105 from cisagov/maintenance/update_pre-commit_hooks

da532a5

Update `pre-commit` hooks

Add pre-commit hooks to validate GitHub Actions content

49d87d4

Add hooks to validate GitHub Actions and GitHub Action workflows. These are validated using JSON Schemas.

Merge pull request #109 from cisagov/improvement/add_github_actions_p…

4215ba3

…re-commit_hooks Add `pre-commit` hooks to validate GitHub Actions content

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

7e230e1

Enable Dependabot ignore directives

7213771

Uncomment the `github-actions` Dependabot ignore directives because those dependencies are managed by cisagov/skeleton-generic upstream.

cisagovbot assigned jsf9k and mcdonnnj Jun 13, 2022

cisagovbot added the upstream update This issue or pull request pulls in upstream updates label Jun 13, 2022

mcdonnnj unassigned felddy, jsf9k and dav3r Jun 22, 2022

mcdonnnj force-pushed the lineage/skeleton branch 2 times, most recently from 6507a72 to 29e5f0c Compare June 22, 2022 18:13

jsf9k self-assigned this Sep 26, 2022

Merge remote-tracking branch 'skeleton-docker/develop' into lineage/s…

08cd3ee

…keleton

jsf9k force-pushed the lineage/skeleton branch from 29e5f0c to 08cd3ee Compare September 26, 2022 14:10

jsf9k added 2 commits September 26, 2022 10:14

Bump version from 1.1.13 to 1.1.14

667c18e

Bump version of libpq-dev package

66110e6

Version 13.5-0-deb11u1 was being used before, but that version is no longer available.

jsf9k force-pushed the lineage/skeleton branch from 6097de2 to 66110e6 Compare September 26, 2022 14:21

jsf9k marked this pull request as ready for review September 26, 2022 14:34

jsf9k requested review from dav3r, felddy, jsf9k and mcdonnnj as code owners September 26, 2022 14:34

Uncomment dependabot ignore directives

94f5842

jsf9k approved these changes Sep 26, 2022

View reviewed changes

dav3r approved these changes Sep 26, 2022

View reviewed changes

This was referenced Sep 28, 2022

Use the latest version of cisagov/guacscanner cisagov/guacamole-composition#52

Merged

Install the latest version of the Guacamole Docker composition cisagov/ansible-role-guacamole#60

Merged

mcdonnnj approved these changes Sep 28, 2022

View reviewed changes

jsf9k merged commit 4e68cc0 into develop Sep 29, 2022

jsf9k deleted the lineage/skeleton branch September 29, 2022 11:48

jsf9k mentioned this pull request Sep 29, 2022

Bump version to pick up latest version of the Guacamole Docker composition cisagov/guacamole-packer#82

Merged

10 tasks

jsf9k added a commit that referenced this pull request Jul 17, 2023

Merge pull request #20 from cisagov/lineage/skeleton

a69d804

⚠️ CONFLICT! Lineage pull request for: skeleton

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

cisagovbot commented Jun 13, 2022 •

edited by jsf9k

Loading

jsf9k commented Sep 26, 2022

dav3r left a comment

mcdonnnj left a comment

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

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

Conversation

cisagovbot commented Jun 13, 2022 • edited by jsf9k Loading

Lineage Pull Request: CONFLICT

How to resolve the conflicts

jsf9k commented Sep 26, 2022

dav3r left a comment

Choose a reason for hiding this comment

mcdonnnj left a comment

Choose a reason for hiding this comment

cisagovbot commented Jun 13, 2022 •

edited by jsf9k

Loading