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

cisagovbot · 2022-11-21T23:25:17Z

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 .github/dependabot.yml README.md 
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

Additionally as of v3.1.0 of actions/setup-go there is a go-version output value to retrieve the version of Go installed by the Action. This allows us to remove the step to manually retrieve this information from the Go executable.

Go 1.16 is no longer supported as of the release of 1.18 so it makes sense to update to the latest version available.

Go 1.19 was released while this branch was in the wings and it makes sense to bump to the latest Go release.

Update Go installation in the `build.yml` workflow

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

…orp/setup-terraform-2 Bump hashicorp/setup-terraform from 1 to 2

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 3 to 4. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](actions/setup-python@v3...v4) --- 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>

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

Add a comment that states that the commented out ignore directives are managed by cisagov/skeleton-generic.

This adds the other versioned Actions that should be managed by cisagov/skeleton-generic to the list of commented out dependencies to ignore.

…nores Update Dependabot ignore directives

GitHub has deprecated the set-output command per: https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/ This updates the GitHub Actions workflow to use the newly preferred method to set the output for a job's step.

Remove usage of `set-output` from our GitHub Actions workflow

Increase the line length maximum from the default of 80 to 88. This 10% increase mirrors the line length allowed in other linter configurations such as black.

…-length_rules Update the `line-length` configuration for `yamllint`

Per PyCQA/flake8#1290 this hook moved from GitLab to GitHub. The version we use is bumped to the latest tag on GitHub as well.

Update the `flake8` pre-commit hook configuration

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

Update pre-commit hooks

This configuration file stores information about the labels expected in this repository.

This adds a workflow to ensure that the repository labels are updated to reflect changes to the label configuration file .github/labels.yml.

Add workflow to manage repository labels

Update the configuration for repository labels to remove the leading `#` from color values. With a `#` leading the values they are seen as invalid by the GitHub API.

There was a missing empty line in the `.yamllint` file between two rule definitions.

Update two configuration files

…skeleton

It somehow breaks the multi-platform build, and in any case the only version of wheel that matters is the one in the venv.

venv isn't installed via pip but is built into Python.

dav3r

🥑 👍

Dockerfile

Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>

mcdonnnj

Two items here that might be out of scope:

I think the emojis on

guacscanner-docker/README.md

Line 1 in 24cf8aa

# guacscanner-docker 💀🐳 #

are leftovers from the skeleton.

We also need to update the URL here

guacscanner-docker/README.md

Line 11 in 24cf8aa

    
           [![Platforms](https://img.shields.io/badge/platforms-amd64%20%7C%20arm%2Fv6%20%7C%20arm%2Fv7%20%7C%20arm64%20%7C%20ppc64le%20%7C%20s390x-blue)](https://hub.docker.com/r/cisagov/guacscanner-docker/tags)

to https://hub.docker.com/r/cisagov/guacscanner/tags

One item directly tied to this PR is please change

guacscanner-docker/Dockerfile

Line 153 in 24cf8aa

# Prepare to Run

to run.

.github/labels.yml

Dockerfile

Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>

jsf9k · 2022-12-16T14:28:45Z

Two items here that might be out of scope:

I think the emojis on

guacscanner-docker/README.md

Line 1 in 24cf8aa

# guacscanner-docker 💀🐳 #

are leftovers from the skeleton.

Please see commit 4dea8c0.

We also need to update the URL here

guacscanner-docker/README.md

Line 11 in 24cf8aa

[![Platforms](https://img.shields.io/badge/platforms-amd64%20%7C%20arm%2Fv6%20%7C%20arm%2Fv7%20%7C%20arm64%20%7C%20ppc64le%20%7C%20s390x-blue)](https://hub.docker.com/r/cisagov/guacscanner-docker/tags)

to https://hub.docker.com/r/cisagov/guacscanner/tags

Please see commit bc7aa3c.

One item directly tied to this PR is please change

guacscanner-docker/Dockerfile

Line 153 in 24cf8aa

# Prepare to Run

to run.

Please see commit 00ec922.

Dockerfile

Version 13.8-0+deb11u1 is no longer available.

Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>

⚠️ CONFLICT! Lineage pull request for: skeleton

mcdonnnj and others added 30 commits May 27, 2022 18:04

Update actions/setup-go from v2 to v3

57b4abe

Additionally as of v3.1.0 of actions/setup-go there is a go-version output value to retrieve the version of Go installed by the Action. This allows us to remove the step to manually retrieve this information from the Go executable.

Update the version of Go used from 1.16 to 1.18

8f68498

Go 1.16 is no longer supported as of the release of 1.18 so it makes sense to update to the latest version available.

Update the version of Go used from 1.18 to 1.19

fc55e84

Go 1.19 was released while this branch was in the wings and it makes sense to bump to the latest Go release.

Merge pull request #113 from cisagov/improvement/update_go_configuration

ec83308

Update Go installation in the `build.yml` workflow

Merge pull request #111 from cisagov/dependabot/github_actions/hashic…

4925eb1

…orp/setup-terraform-2 Bump hashicorp/setup-terraform from 1 to 2

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

f74b4a3

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

Add an ownership comment to the Dependabot configuration

6a9c630

Add a comment that states that the commented out ignore directives are managed by cisagov/skeleton-generic.

Add additional Dependabot ignore directives

dfd54e9

This adds the other versioned Actions that should be managed by cisagov/skeleton-generic to the list of commented out dependencies to ignore.

Merge pull request #112 from cisagov/improvement/update_dependabot_ig…

a8bcddd

…nores Update Dependabot ignore directives

Merge pull request #119 from cisagov/bug/update_github_actions_workflow

0867685

Remove usage of `set-output` from our GitHub Actions workflow

Enable the allow-non-breakable-inline-mappings rule for yamllint

21a68f4

Increase the maximum line length in the yamllint configuration

3547c4f

Increase the line length maximum from the default of 80 to 88. This 10% increase mirrors the line length allowed in other linter configurations such as black.

Merge pull request #117 from cisagov/improvement/update_yamllint_line…

cfa9ba5

…-length_rules Update the `line-length` configuration for `yamllint`

Fix the repo of the flake8 pre-commit hook

b1ea3d4

Per PyCQA/flake8#1290 this hook moved from GitLab to GitHub. The version we use is bumped to the latest tag on GitHub as well.

Merge pull request #120 from cisagov/bug/verify_pre-commit_hook_repos

2a98c6a

Update the `flake8` pre-commit hook configuration

Update pre-commit hooks

fb8d13f

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

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

bb9c2a0

Update pre-commit hooks

Add a label configuration file

e5fbd70

This configuration file stores information about the labels expected in this repository.

Add a workflow to synchronize repository labels

b9792a8

This adds a workflow to ensure that the repository labels are updated to reflect changes to the label configuration file .github/labels.yml.

Remove duplicate label

161c4ae

Add a label for issues or PRs that involve test code

5993231

Merge pull request #118 from cisagov/improvement/add_label_sync_workflow

c4fbf20

Add workflow to manage repository labels

Fix GitHub label color values

6cc53dc

Update the configuration for repository labels to remove the leading `#` from color values. With a `#` leading the values they are seen as invalid by the GitHub API.

Correct spacing in yamllint rules

8f12635

There was a missing empty line in the `.yamllint` file between two rule definitions.

Merge pull request #122 from cisagov/bug/fix_bad_configurations

e803e1a

Update two configuration files

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

bade9e2

…skeleton

Add repository specific label

663dd87

jsf9k force-pushed the lineage/skeleton branch from 6fe652d to d15dee2 Compare November 22, 2022 18:28

jsf9k added 2 commits November 22, 2022 13:48

Remove upgrade of wheel

88c14c9

It somehow breaks the multi-platform build, and in any case the only version of wheel that matters is the one in the venv.

Remove venv from list of packages to be upgraded via pip3

9a9f092

venv isn't installed via pip but is built into Python.

jsf9k marked this pull request as ready for review November 22, 2022 19:30

jsf9k requested review from dav3r, felddy, jsf9k and mcdonnnj as code owners November 22, 2022 19:30

jsf9k approved these changes Nov 22, 2022

View reviewed changes

Bump version from 1.1.15 to 1.1.16

f8ee358

dav3r approved these changes Nov 28, 2022

View reviewed changes

mcdonnnj requested changes Dec 7, 2022

View reviewed changes

Dockerfile Show resolved Hide resolved

Dockerfile Show resolved Hide resolved

Dockerfile Outdated Show resolved Hide resolved

jsf9k and others added 2 commits December 7, 2022 16:13

Move trailing logical operators onto the following line

346d3c9

Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>

Restore comment

24cf8aa

Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>

jsf9k requested a review from mcdonnnj December 7, 2022 21:24

mcdonnnj requested changes Dec 15, 2022

View reviewed changes

.github/labels.yml Show resolved Hide resolved

Dockerfile Show resolved Hide resolved

jsf9k and others added 4 commits December 16, 2022 09:18

Add python label

a16dce5

Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>

Remove emojis carried over from skeleton

4dea8c0

Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>

Change a word in a comment to lowercase

00ec922

Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>

Correct URL

bc7aa3c

Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>

jsf9k requested a review from mcdonnnj December 16, 2022 14:28

mcdonnnj approved these changes Dec 16, 2022

View reviewed changes

Dockerfile Outdated Show resolved Hide resolved

jsf9k force-pushed the lineage/skeleton branch from 9e3340c to bc7aa3c Compare December 19, 2022 14:57

Bump up the version of libpq-dev being installed

ee0981e

Version 13.8-0+deb11u1 is no longer available.

jsf9k requested a review from mcdonnnj December 19, 2022 15:09

Prefer long command line options

4f47332

Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>

jsf9k merged commit abb25a6 into develop Dec 19, 2022

jsf9k deleted the lineage/skeleton branch December 19, 2022 17:32

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

Merge pull request #26 from cisagov/lineage/skeleton

ddb6686

⚠️ 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 #26

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

cisagovbot commented Nov 21, 2022 •

edited by jsf9k

Loading

dav3r left a comment

mcdonnnj left a comment

jsf9k commented Dec 16, 2022

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

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

Conversation

cisagovbot commented Nov 21, 2022 • edited by jsf9k Loading

Lineage Pull Request: CONFLICT

How to resolve the conflicts

dav3r left a comment

Choose a reason for hiding this comment

mcdonnnj left a comment

Choose a reason for hiding this comment

jsf9k commented Dec 16, 2022

cisagovbot commented Nov 21, 2022 •

edited by jsf9k

Loading